Changeset 251856 in webkit

Timestamp:

Oct 31, 2019 10:35:06 AM (4 years ago)

Author:

yurys@chromium.org

Message:

[GTK] Web Inspector: inspector/timeline/timeline-event-*.html are failing
​https://bugs.webkit.org/show_bug.cgi?id=203625

Reviewed by Devin Rousso.

Unflake inspector/timeline/timeline-event-*.html tests on GTK.

• inspector/timeline/resources/timeline-event-utilities.js: There is a race between CapturingState.Inactive

and SavePageData events, so the test has to wait for both.
Drive-by: wrap promis.reject in a lambda, otherwise reject would be called on an undefined 'this' object.
arrive before resolving the promise.
(TestPage.registerInitializer):

• platform/gtk/TestExpectations:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/timeline/resources/timeline-event-utilities.js (modified) (3 diffs)
• platform/gtk/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-10-31  Yury Semikhatsky  <yurys@chromium.org>
+
+        [GTK] Web Inspector: inspector/timeline/timeline-event-*.html are failing
+        https://bugs.webkit.org/show_bug.cgi?id=203625
+
+        Reviewed by Devin Rousso.
+
+        Unflake inspector/timeline/timeline-event-*.html tests on GTK.
+
+        * inspector/timeline/resources/timeline-event-utilities.js: There is a race between CapturingState.Inactive
+        and SavePageData events, so the test has to wait for both.
+        Drive-by: wrap promis.reject in a lambda, otherwise reject would be called on an undefined 'this' object.
+        arrive before resolving the promise.
+        (TestPage.registerInitializer):
+        * platform/gtk/TestExpectations:
+
 2019-10-31  Miguel Gomez  <magomez@igalia.com>
 

trunk/LayoutTests/inspector/timeline/resources/timeline-event-utilities.js

@@ -7 +7 @@
 
     InspectorTest.TimelineEvent.captureTimelineWithScript = function({expression, eventType}) {
-        let pageRecordingData = null;
+        let savePageDataPromise = InspectorTest.awaitEvent("SavePageData").then((event) => {
+            return event.data;
+        });
 
         let promise = new WI.WrappedPromise;
@@ -29 +31 @@
                 InspectorTest.log("Evaluating...");
                 InspectorTest.evaluateInPage(expression)
-                .catch(promise.reject);
+                .catch((error) => {
+                    promise.reject(error);
+                });
                 return;
             }
@@ -35 +39 @@
             if (WI.timelineManager.capturingState === WI.TimelineManager.CapturingState.Inactive) {
                 WI.timelineManager.removeEventListener(WI.TimelineManager.Event.CapturingStateChanged, listener);
-                InspectorTest.assert(pageRecordingData, "savePageData should have been called in the page before capturing was stopped.");
-                promise.resolve(pageRecordingData);
+                InspectorTest.assert(savePageDataPromise, "savePageData should have been called in the page before capturing was stopped.");
+                savePageDataPromise.then((data) => {
+                    promise.resolve(data);
+                });
                 return;
             }
-        });
-
-        InspectorTest.awaitEvent("SavePageData").then((event) => {
-            pageRecordingData = event.data;
         });
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -2376 +2376 @@
 webkit.org/b/137698 media/video-controls-drag.html [ Timeout ]
 
-webkit.org/b/203625 inspector/timeline/timeline-event-CancelAnimationFrame.html  [ Pass Failure ]
-webkit.org/b/203625 inspector/timeline/timeline-event-EventDispatch.html  [ Pass Failure ]
-webkit.org/b/203625 inspector/timeline/timeline-event-FireAnimationFrame.html  [ Pass Failure ]
-webkit.org/b/203625 inspector/timeline/timeline-event-RequestAnimationFrame.html  [ Pass Failure ]
-webkit.org/b/203625 inspector/timeline/timeline-event-TimerFire.html  [ Pass Failure ]
-webkit.org/b/203625 inspector/timeline/timeline-event-TimerInstall.html  [ Pass Failure ]
-webkit.org/b/203625 inspector/timeline/timeline-event-TimerRemove.html  [ Pass Failure ]
-
 webkit.org/b/139362 inspector/css/pseudo-element-matches.html [ Failure ]
 webkit.org/b/139362 inspector/css/selector-specificity.html [ Timeout Pass ]