Changeset 252067 in webkit

Timestamp:

Nov 5, 2019 11:53:40 AM (4 years ago)

Author:

Devin Rousso

Message:

Layout test http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html is a flakey failure
​https://bugs.webkit.org/show_bug.cgi?id=203841
<rdar://problem/51752151>

Reviewed by Brian Burg.

• http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html:

Rewrite the test so it actually waits for the resource response information to be received
in the frontend before testing any information about the resource, as the response is what
contains the status code and source. Previously, we would only wait for the inspected page
to finish loading, which did guarantee that the inspector frontend at least knew about the
resource being loaded, but not necessarily that it had been told about the response.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-05  Devin Rousso  <drousso@apple.com>
+
+        Layout test http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html is a flakey failure
+        https://bugs.webkit.org/show_bug.cgi?id=203841
+        <rdar://problem/51752151>
+
+        Reviewed by Brian Burg.
+
+        * http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html:
+        Rewrite the test so it actually waits for the resource response information to be received
+        in the frontend before testing any information about the resource, as the response is what
+        contains the status code and source. Previously, we would only wait for the inspected page
+        to finish loading, which did guarantee that the inspector frontend at least knew about the
+        resource being loaded, but not necessarily that it had been told about the response.
+
 2019-11-05  Daniel Bates  <dabates@apple.com>
 

trunk/LayoutTests/http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html

@@ -6 +6 @@
 <script src="../resources/inspector-test.js"></script>
 <script>
-TestPage.dispatchEventToFrontend("LoadComplete");
-
 function test()
 {
@@ -16 +14 @@
             name, description,
             test(resolve, reject) {
-                InspectorTest.reloadPage({ignoreCache, revalidateAllResources: true});
-                InspectorTest.awaitEvent("LoadComplete").then((event) => {
-                    let resource = null;
-                    for (let item of WI.networkManager.mainFrame.resourceCollection) {
-                        if (pattern.test(item.url)) {
-                            resource = item;
-                            break;
-                        }
-                    }
-                    if (!resource) {
-                        InspectorTest.fail("Failed to find specific resource.");
-                        reject();
+                let listener = WI.Resource.addEventListener(WI.Resource.Event.ResponseReceived, (event) => {
+                    let resource = event.target;
+                    if (!pattern.test(resource.url))
                         return;
-                    }
+
                     InspectorTest.expectThat(resource instanceof WI.Resource, "Resource should exist.");
                     InspectorTest.expectEqual(resource.statusCode, statusCode, `statusCode should be ${statusCode}`);
                     InspectorTest.expectEqual(resource.responseSource, responseSource, `responseSource should be ${String(responseSource)}`);
-                }).then(resolve, reject);
+
+                    WI.Resource.removeEventListener(WI.Resource.Event.ResponseReceived, listener);
+                    resolve();
+                });
+
+                InspectorTest.reloadPage({ignoreCache, revalidateAllResources: true});
             }
         });