Title: [197320] releases/WebKitGTK/webkit-2.12/LayoutTests
Revision
197320
Author
[email protected]
Date
2016-02-29 01:25:53 -0800 (Mon, 29 Feb 2016)

Log Message

Merge r197138 - Unreviewed test gardening.

Fix a test flake where order doesn't matter.

* platform/wk2/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt: Removed.
* storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt:
* storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-private-expected.txt:
* storage/indexeddb/resources/deletedatabase-delayed-by-open-and-versionchange.js:
(prepareDatabase.request.onblocked):
(onOpenSuccess):

Modified Paths

Removed Paths

Diff

Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (197319 => 197320)


--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog	2016-02-29 09:25:11 UTC (rev 197319)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog	2016-02-29 09:25:53 UTC (rev 197320)
@@ -1,5 +1,18 @@
 2016-02-25  Brady Eidson  <[email protected]>
 
+        Unreviewed test gardening.
+
+        Fix a test flake where order doesn't matter.
+
+        * platform/wk2/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt: Removed.
+        * storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt:
+        * storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-private-expected.txt:
+        * storage/indexeddb/resources/deletedatabase-delayed-by-open-and-versionchange.js:
+        (prepareDatabase.request.onblocked):
+        (onOpenSuccess):
+
+2016-02-25  Brady Eidson  <[email protected]>
+
         Modern IDB: WebKit 2 IPC layer.
         https://bugs.webkit.org/show_bug.cgi?id=153808
 

Deleted: releases/WebKitGTK/webkit-2.12/LayoutTests/platform/wk2/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt (197319 => 197320)


--- releases/WebKitGTK/webkit-2.12/LayoutTests/platform/wk2/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt	2016-02-29 09:25:11 UTC (rev 197319)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/platform/wk2/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt	2016-02-29 09:25:53 UTC (rev 197320)
@@ -1,35 +0,0 @@
-Test that deleteDatabase is delayed if a VERSION_CHANGE transaction is running
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-
-indexedDB.deleteDatabase(dbname)
-indexedDB.open(dbname)
-
-prepareDatabase():
-versionChangeComplete = false
-h = event.target.result
-indexedDB.deleteDatabase(dbname)
-
-onVersionChange():
-PASS event.target.version is 1
-PASS event.oldVersion is 1
-PASS event.newVersion is null
-
-transactionOnComplete():
-versionChangeComplete = true
-
-deleteDatabaseOnBlocked():
-
-onOpenSuccess():
-h = event.target.result
-h.close()
-
-deleteDatabaseOnSuccess():
-PASS versionChangeComplete is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt (197319 => 197320)


--- releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt	2016-02-29 09:25:11 UTC (rev 197319)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-expected.txt	2016-02-29 09:25:53 UTC (rev 197320)
@@ -18,12 +18,11 @@
 PASS event.oldVersion is 1
 PASS event.newVersion is null
 
-deleteDatabaseOnBlocked():
-
 transactionOnComplete():
 versionChangeComplete = true
 
 onOpenSuccess():
+PASS blockedCalled is true
 h = event.target.result
 h.close()
 

Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-private-expected.txt (197319 => 197320)


--- releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-private-expected.txt	2016-02-29 09:25:11 UTC (rev 197319)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange-private-expected.txt	2016-02-29 09:25:53 UTC (rev 197320)
@@ -18,12 +18,11 @@
 PASS event.oldVersion is 1
 PASS event.newVersion is null
 
-deleteDatabaseOnBlocked():
-
 transactionOnComplete():
 versionChangeComplete = true
 
 onOpenSuccess():
+PASS blockedCalled is true
 h = event.target.result
 h.close()
 

Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/resources/deletedatabase-delayed-by-open-and-versionchange.js (197319 => 197320)


--- releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/resources/deletedatabase-delayed-by-open-and-versionchange.js	2016-02-29 09:25:11 UTC (rev 197319)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/resources/deletedatabase-delayed-by-open-and-versionchange.js	2016-02-29 09:25:53 UTC (rev 197320)
@@ -6,6 +6,7 @@
 description("Test that deleteDatabase is delayed if a VERSION_CHANGE transaction is running");
 
 indexedDBTest(prepareDatabase, onOpenSuccess);
+
 function prepareDatabase(evt)
 {
     preamble(evt);
@@ -28,7 +29,7 @@
     request = evalAndLog("indexedDB.deleteDatabase(dbname)");
     request._onerror_ = unexpectedErrorCallback;
     request._onblocked_ = function deleteDatabaseOnBlocked(evt) {
-        preamble(evt);
+        eval("blockedCalled = true");
     };
     request._onsuccess_ = function deleteDatabaseOnSuccess(evt) {
         preamble(evt);
@@ -40,6 +41,7 @@
 function onOpenSuccess(evt)
 {
     preamble(evt);
+    shouldBeTrue("blockedCalled");
     evalAndLog("h = event.target.result");
     evalAndLog("h.close()");
 }
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to