Changeset 85153 in webkit

Timestamp:

Apr 27, 2011 10:18:38 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-27 Mark Pilgrim <​pilgrim@chromium.org>

Reviewed by Tony Chang.

Should call done() from unexpectedErrorCallback so failing IndexedDB tests don't time out
​https://bugs.webkit.org/show_bug.cgi?id=59569

• storage/indexeddb/exception-in-event-aborts-expected.txt:
• storage/indexeddb/exception-in-event-aborts.html:
• storage/indexeddb/resources/shared.js: (unexpectedSuccessCallback): (unexpectedErrorCallback): (unexpectedAbortCallback): (unexpectedCompleteCallback): (unexpectedBlockedCallback):

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• storage/indexeddb/exception-in-event-aborts-expected.txt (modified) (1 diff)
• storage/indexeddb/exception-in-event-aborts.html (modified) (1 diff)
• storage/indexeddb/resources/shared.js (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-27  Mark Pilgrim  <pilgrim@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Should call done() from unexpectedErrorCallback so failing IndexedDB tests don't time out
+        https://bugs.webkit.org/show_bug.cgi?id=59569
+
+        * storage/indexeddb/exception-in-event-aborts-expected.txt:
+        * storage/indexeddb/exception-in-event-aborts.html:
+        * storage/indexeddb/resources/shared.js:
+        (unexpectedSuccessCallback):
+        (unexpectedErrorCallback):
+        (unexpectedAbortCallback):
+        (unexpectedCompleteCallback):
+        (unexpectedBlockedCallback):
+
 2011-04-27  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/LayoutTests/storage/indexeddb/exception-in-event-aborts-expected.txt

@@ -52 +52 @@
 store = trans.objectStore('storeName')
 store.add({x: 'value4', y: 'zzz4'}, 'key4')
-FAIL Success function called unexpectedly.
+PASS key4 added
 
 PASS The transaction completed.

trunk/LayoutTests/storage/indexeddb/exception-in-event-aborts.html

@@ -113 +113 @@
     store = evalAndLog("store = trans.objectStore('storeName')");
     request = evalAndLog("store.add({x: 'value4', y: 'zzz4'}, 'key4')");
-    request.onsuccess = unexpectedSuccessCallback;
-    request.onerror = throwAndCatch;
+    request.onsuccess = function() { testPassed("key4 added"); }
+    request.onerror = unexpectedErrorCallback;
 }
 

trunk/LayoutTests/storage/indexeddb/resources/shared.js

@@ -9 +9 @@
 {
     testFailed("Success function called unexpectedly.");
+    done();
 }
 
@@ -14 +15 @@
 {
     testFailed("Error function called unexpectedly: (" + event.target.errorCode + ") " + event.target.webkitErrorMessage);
+    done();
 }
 
@@ -19 +21 @@
 {
     testFailed("Abort function called unexpectedly!");
+    done();
 }
 
@@ -24 +27 @@
 {
     testFailed("oncomplete function called unexpectedly!");
+    done();
 }
 
@@ -29 +33 @@
 {
     testFailed("onblocked called unexpectedly");
+    done();
 }