Changeset 154911 in webkit

Timestamp:

Aug 30, 2013 2:43:01 PM (11 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: inspector/storage-panel-dom-storage-update.html is flakey on the bots
​https://bugs.webkit.org/show_bug.cgi?id=120544

Take 2, remove some more runAfterPendingDispatches which were somehow
causing WebKit 2 tests to fail. This requires us to be a bit more
careful when running the pending handlers as well.

Unreviewed test fix.

• inspector/storage-panel-dom-storage-update.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/storage-panel-dom-storage-update.html (modified) (8 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-30  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: inspector/storage-panel-dom-storage-update.html is flakey on the bots
+        https://bugs.webkit.org/show_bug.cgi?id=120544
+
+        Take 2, remove some more runAfterPendingDispatches which were somehow
+        causing WebKit 2 tests to fail. This requires us to be a bit more
+        careful when running the pending handlers as well.
+
+        Unreviewed test fix.
+
+        * inspector/storage-panel-dom-storage-update.html:
+
 2013-08-30  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/LayoutTests/inspector/storage-panel-dom-storage-update.html

@@ -43 +43 @@
     InspectorTest.addSniffer(WebInspector.DOMStorageDispatcher.prototype, "domStorageItemsCleared", function() {
         if (nextDOMStorageClearHandler) {
-            nextDOMStorageClearHandler();
+            var handler = nextDOMStorageClearHandler;
             nextDOMStorageClearHandler = null;
+            handler();
         } else
             InspectorTest.addResult("ERROR: domStorageItemsCleared event without handler");
@@ -52 +53 @@
     InspectorTest.addSniffer(WebInspector.DOMStorageDispatcher.prototype, "domStorageItemAdded", function() {
         if (nextDOMStorageAddHandler) {
-            nextDOMStorageAddHandler();
+            var handler = nextDOMStorageAddHandler;
             nextDOMStorageAddHandler = null;
+            handler();
         } else
             InspectorTest.addResult("ERROR: domStorageItemAdded event without handler");
@@ -61 +63 @@
     InspectorTest.addSniffer(WebInspector.DOMStorageDispatcher.prototype, "domStorageItemRemoved", function() {
         if (nextDOMStorageRemoveHandler) {
-            nextDOMStorageRemoveHandler();
+            var handler = nextDOMStorageRemoveHandler;
             nextDOMStorageRemoveHandler = null;
+            handler();
         } else
             InspectorTest.addResult("ERROR: domStorageItemRemoved event without handler");
     }, true);
-
 
     InspectorTest.runTestSuite([
@@ -91 +93 @@
             }
 
+            var didFindStorage = false;
+
             var storages = WebInspector.domStorageModel.storages();
             for (var i = 0; i < storages.length; ++i) {
@@ -97 +101 @@
                     WebInspector.panels.resources._showDOMStorage(storage);
                     InspectorTest.runAfterPendingDispatches(localStorageViewUpdated);
+                    didFindStorage = true;
                     break;
                 }
             }
+
+            if (!didFindStorage)
+                InspectorTest.addResult("did not find local storage");
         },
 
@@ -106 +114 @@
             function viewUpdatedAfterAddition()
             {
-                InspectorTest.runAfterPendingDispatches(function() {
-                    rootNode = WebInspector.panels.resources._domStorageViews.get(storage)._dataGrid.rootNode();
-                    dumpDataGrid();
-                    if (count < 6)
-                        addItemTest(next);
-                    else
-                        next();
-                });
+                rootNode = WebInspector.panels.resources._domStorageViews.get(storage)._dataGrid.rootNode();
+                dumpDataGrid();
+                if (count < 6)
+                    addItemTest(next);
+                else
+                    next();
             }
 
@@ -127 +133 @@
             function viewUpdatedAfterRemoval()
             {
-                InspectorTest.runAfterPendingDispatches(function() {
-                    rootNode = WebInspector.panels.resources._domStorageViews.get(storage)._dataGrid.rootNode();
-                    dumpDataGrid();
-                    if (count > 4)
-                        removeItemTest(next);
-                    else
-                        next();
-                });
+                rootNode = WebInspector.panels.resources._domStorageViews.get(storage)._dataGrid.rootNode();
+                dumpDataGrid();
+                if (count > 4)
+                    removeItemTest(next);
+                else
+                    next();
             }
 
@@ -148 +152 @@
             function viewUpdatedAfterClear()
             {
-                InspectorTest.runAfterPendingDispatches(function() {
-                    rootNode = WebInspector.panels.resources._domStorageViews.get(storage)._dataGrid.rootNode();
-                    dumpDataGrid();
-                    next();
-                });
+                rootNode = WebInspector.panels.resources._domStorageViews.get(storage)._dataGrid.rootNode();
+                dumpDataGrid();
+                next();
             }