Not reviewed.

        Fixed a hang in the layout tests.
        My checkin earlier today broke things such that the transaction call errors out instead of succeeds.
        Therefore LayoutTestController is never notified that the test is done.

        This changes modifies the test such that the controller is notified of completion even if
        there's a transaction error.

        The net effect of this fix is to transform the hang to a single layout test failure, so people
        and the bots don't have their run-webkit-tests hang while I try to fix the real regression.

        * storage/transaction_callback_exception_crash.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28213 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4610c160b5f203a8ae0b24e8aefa6de928f2d8ee..26ea07b0191d34d16030ae39f012cc82bb4a37f0 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2007-11-29  Brady Eidson  <beidson@apple.com>
+
+        Not reviewed.
+
+        Fixed a hang in the layout tests.
+        My checkin earlier today broke things such that the transaction call errors out instead of succeeds.
+        Therefore LayoutTestController is never notified that the test is done.
+        
+        This changes modifies the test such that the controller is notified of completion even if
+        there's a transaction error.
+
+        The net effect of this fix is to transform the hang to a single layout test failure, so people
+        and the bots don't have their run-webkit-tests hang while I try to fix the real regression.
+
+        * storage/transaction_callback_exception_crash.html:
+
 2007-11-29  Darin Adler  <darin@apple.com>
 
         Reviewed by Adele.

diff --git a/LayoutTests/storage/transaction_callback_exception_crash.html b/LayoutTests/storage/transaction_callback_exception_crash.html
index 65b2efdd50313d5a9c6f47f952be38b2a514707c..258d037f82a1147c005cc488d5a6dc515b3cafc2 100644 (file)
--- a/LayoutTests/storage/transaction_callback_exception_crash.html
+++ b/LayoutTests/storage/transaction_callback_exception_crash.html
@@ -12,6 +12,10 @@ db.transaction(function(tx) {
     if (window.layoutTestController)
         setTimeout("layoutTestController.notifyDone()", 0);
     throw "TransactionCallbackError";
+}, function(err) {
+    if (window.layoutTestController)
+        setTimout("layoutTestController.notifyDone()", 0);
+    document.body.innerText = "Transaction error occured";
 });
 
 </script>