Changeset 135868 in webkit

Timestamp:

Nov 27, 2012 9:45:23 AM (11 years ago)

Author:

dgrogan@chromium.org

Message:

IndexedDB: Make test resilient to different event ordering
​https://bugs.webkit.org/show_bug.cgi?id=103344

Reviewed by Tony Chang.

This test was failing in multi-process chromium because the blocked
event can arrive before the versionchange event.

• storage/indexeddb/pending-version-change-on-exit.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• storage/indexeddb/pending-version-change-on-exit.html (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-27  David Grogan  <dgrogan@chromium.org>
+
+        IndexedDB: Make test resilient to different event ordering
+        https://bugs.webkit.org/show_bug.cgi?id=103344
+
+        Reviewed by Tony Chang.
+
+        This test was failing in multi-process chromium because the blocked
+        event can arrive before the versionchange event.
+
+        * storage/indexeddb/pending-version-change-on-exit.html:
+
 2012-11-27  Min Qin  <qinmin@chromium.org>
 

trunk/LayoutTests/storage/indexeddb/pending-version-change-on-exit.html

@@ -13 +13 @@
   finishJSTest();
 } else {
+  evalAndLog("workerGotBlocked = false");
   evalAndLog("gotVersionChangeEvent = false");
   indexedDBTest(prepareDatabase, startTheWorker);
@@ -22 +23 @@
   preamble();
   db = event.target.result;
-  db.onversionchange = function(e) {
-    evalAndLog("gotVersionChangeEvent = true");
-    debug("Got a version change event, e.oldVersion = " + e.oldVersion +
-          " e.newVersion = " + e.newVersion);
-  };
+  db.onversionchange = onVersionChange;
 }
 
-function startTheWorker() {
+function startTheWorker()
+{
   var worker = startWorker("resources/pending-version-change-on-exit.js?" + encodeURIComponent(dbname));
   realFinishJSTest = finishJSTest;
@@ -37 +35 @@
   };
   finishJSTest = function() {
-    shouldBeTrue("gotVersionChangeEvent");
-    if (gotVersionChangeEvent)
-      self.location = self.location + "?second";
-    else
-      realFinishJSTest();
+    workerGotBlocked = true;
+    maybeReload();
   }
 }
+
+function onVersionChange(e)
+{
+  gotVersionChangeEvent = true;
+  maybeReload();
+};
+
+function maybeReload()
+{
+  if (gotVersionChangeEvent && workerGotBlocked)
+    self.location = self.location + "?second";
+};
+
 </script>
 <script src="../../fast/js/resources/js-test-post.js"></script>