Modern IDB: storage/indexeddb/intversion-long-queue.html fails.

https://bugs.webkit.org/show_bug.cgi?id=152995

Reviewed by Alex Christensen.

* platform/mac-wk1/TestExpectations:
* storage/indexeddb/intversion-long-queue-expected.txt:
* storage/indexeddb/resources/intversion-long-queue.js:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5b15aaf..fed7acd 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2016-01-11  Brady Eidson  <beidson@apple.com>
 
+        Modern IDB: storage/indexeddb/intversion-long-queue.html fails.
+        https://bugs.webkit.org/show_bug.cgi?id=152995
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+        * storage/indexeddb/intversion-long-queue-expected.txt:
+        * storage/indexeddb/resources/intversion-long-queue.js:
+
+2016-01-11  Brady Eidson  <beidson@apple.com>
+
         Modern IDB: storage/indexeddb/index-multientry.html fails under GuardMalloc/ASAN.
         https://bugs.webkit.org/show_bug.cgi?id=152990
 

diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
index 8666d68..da28ad0 100644 (file)
--- a/LayoutTests/platform/mac-wk1/TestExpectations
+++ b/LayoutTests/platform/mac-wk1/TestExpectations
@@ -82,9 +82,6 @@ storage/indexeddb/database-quota.html [ Skip ]
 # Modern IDB page cache interaction not yet sorted out
 fast/history/page-cache-indexed-closed-db.html [ Failure ]
 
-# blocked event comes in different order with different parameters
-storage/indexeddb/intversion-long-queue.html [ Failure ]
-
 # IDB is currently disabled in private browsing.
 # With Modern IDB and the in-memory backing store, that should change.
 storage/indexeddb/open-db-private-browsing.html [ Failure ]

diff --git a/LayoutTests/storage/indexeddb/intversion-long-queue-expected.txt b/LayoutTests/storage/indexeddb/intversion-long-queue-expected.txt
index 6829ea8..af05de8 100644 (file)
--- a/LayoutTests/storage/indexeddb/intversion-long-queue-expected.txt
+++ b/LayoutTests/storage/indexeddb/intversion-long-queue-expected.txt
@@ -35,10 +35,6 @@ request.onupgradeneeded = connection3UpgradeNeeded
 request.onsuccess = connection3Success
 connection1.close()
 
-deleteDatabaseBlockedCallback():
-PASS event.oldVersion is 1
-PASS event.newVersion is null
-
 connection2UpgradeNeeded():
 PASS event.oldVersion is 1
 PASS event.newVersion is 2
@@ -48,6 +44,10 @@ db.createObjectStore('some object store')
 transaction = event.target.transaction
 transaction.oncomplete = connection2TransactionComplete
 
+deleteDatabaseBlockedCallback():
+PASS event.oldVersion is 2
+PASS event.newVersion is null
+
 connection2TransactionComplete():
 PASS db.version is 2
 

diff --git a/LayoutTests/storage/indexeddb/resources/intversion-long-queue.js b/LayoutTests/storage/indexeddb/resources/intversion-long-queue.js
index 61f2950..ff2b81f 100644 (file)
--- a/LayoutTests/storage/indexeddb/resources/intversion-long-queue.js
+++ b/LayoutTests/storage/indexeddb/resources/intversion-long-queue.js
@@ -51,7 +51,7 @@ function connection2Blocked(evt)
 function deleteDatabaseBlockedCallback(evt)
 {
     preamble(evt);
-    shouldBe("event.oldVersion", "1");
+    shouldBe("event.oldVersion", "2");
     shouldBeNull("event.newVersion");
 }