Changeset 216150 in webkit

Timestamp:

May 3, 2017 3:30:38 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

LayoutTest http/tests/inspector/network/fetch-network-data.html is a flaky timeout
​https://bugs.webkit.org/show_bug.cgi?id=166038
<rdar://problem/29488489>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2017-05-03
Reviewed by Matt Baker.

• platform/mac/TestExpectations:
• http/tests/inspector/network/fetch-network-data.html:
• http/tests/inspector/network/xhr-request-data-encoded-correctly.html:

Use singleFireEventListener instead of awaitEvent so that the follow-up event handlers
can be added synchronously instead of in a microtask. When the microtask happened later
than other incoming events then the follow-up handlers would have been added too late.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/inspector/network/fetch-network-data.html (modified) (1 diff)
• http/tests/inspector/network/xhr-request-data-encoded-correctly.html (modified) (2 diffs)
• platform/mac/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-03  Joseph Pecoraro  <pecoraro@apple.com>
+
+        LayoutTest http/tests/inspector/network/fetch-network-data.html is a flaky timeout
+        https://bugs.webkit.org/show_bug.cgi?id=166038
+        <rdar://problem/29488489>
+
+        Reviewed by Matt Baker.
+
+        * platform/mac/TestExpectations:
+        * http/tests/inspector/network/fetch-network-data.html:
+        * http/tests/inspector/network/xhr-request-data-encoded-correctly.html:
+        Use singleFireEventListener instead of awaitEvent so that the follow-up event handlers
+        can be added synchronously instead of in a microtask. When the microtask happened later
+        than other incoming events then the follow-up handlers would have been added too late.
+
 2017-05-03  Matt Lewis  <jlewis3@apple.com>
 

trunk/LayoutTests/http/tests/inspector/network/fetch-network-data.html

@@ -13 +13 @@
             name, test(resolve, reject) {
                 InspectorTest.evaluateInPage(expression);
-                WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded).then((event) => {
+                WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
                     let resource = event.data.resource;
                     InspectorTest.expectEqual(resource.type, WebInspector.Resource.Type.Fetch, "Resource should be Fetch type.");

trunk/LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly.html

@@ -19 +19 @@
         description: "XHR with request data is encoded correctly.",
         test(resolve, reject) {
-            WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded)
-            .then((event) => {
+            InspectorTest.evaluateInPage(`createXHRResource()`);
+            WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
                 let resource = event.data.resource;
                 InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
                 InspectorTest.expectThat(resource.requestData === "utf8=👍", "Request data should have expected content.");
-                return resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFinish);
-            })
-            .then((event) => {
-                InspectorTest.pass("Resource load should finish.");
-            })
-            .then(resolve, reject);
-
-            InspectorTest.evaluateInPage("createXHRResource()");
+                resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFinish)
+                    .then((event) => { InspectorTest.pass("Resource load should finish.") })
+                    .then(resolve, reject);
+                resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFail)
+                    .then(() => { InspectorTest.fail("Resource should not have failed to load.") })
+                    .then(reject, reject);
+            });
         }
     });
@@ -40 +39 @@
 </head>
 <body onload="runTest()">
-    <p>Tests XHR network resource payload is shown with correct encoding.</p>
+<p>Tests XHR network resource payload is shown with correct encoding.</p>
 </body>
 </html>

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1456 +1456 @@
 webkit.org/b/164277 fast/preloader/image-srcset.html [ Pass Failure ]
 
-webkit.org/b/166038 http/tests/inspector/network/fetch-network-data.html [ Pass Timeout ]
-webkit.org/b/164033 http/tests/inspector/network/xhr-request-data-encoded-correctly.html [ Pass Timeout ]
-
 webkit.org/b/165222 [ Debug ] imported/w3c/web-platform-tests/IndexedDB/idbindex-multientry.htm [ Pass Failure ]
 webkit.org/b/165222 [ Debug ] imported/w3c/web-platform-tests/IndexedDB/idbindex-rename-abort.html [ Pass Failure ]