Title: [263078] trunk/LayoutTests
Revision
263078
Author
[email protected]
Date
2020-06-16 00:18:57 -0700 (Tue, 16 Jun 2020)

Log Message

[ Mac wk2 ] http/tests/inspector/network/har/har-page.html is flaky failing
https://bugs.webkit.org/show_bug.cgi?id=207954
<rdar://problem/59599895>

Reviewed by Maciej Stachowiak.

* http/tests/inspector/network/har/har-page.html:
* http/tests/inspector/network/har/har-page-aggressive-gc.html:
* http/tests/inspector/network/har/har-page-aggressive-gc-expected.txt:
Explicitly disable resource caching as the test reloads the page and expects resource load
metrics to be populated/valid.

* platform/mac-wk2/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (263077 => 263078)


--- trunk/LayoutTests/ChangeLog	2020-06-16 07:15:30 UTC (rev 263077)
+++ trunk/LayoutTests/ChangeLog	2020-06-16 07:18:57 UTC (rev 263078)
@@ -1,3 +1,19 @@
+2020-06-16  Devin Rousso  <[email protected]>
+
+        [ Mac wk2 ] http/tests/inspector/network/har/har-page.html is flaky failing
+        https://bugs.webkit.org/show_bug.cgi?id=207954
+        <rdar://problem/59599895>
+
+        Reviewed by Maciej Stachowiak.
+
+        * http/tests/inspector/network/har/har-page.html:
+        * http/tests/inspector/network/har/har-page-aggressive-gc.html:
+        * http/tests/inspector/network/har/har-page-aggressive-gc-expected.txt:
+        Explicitly disable resource caching as the test reloads the page and expects resource load
+        metrics to be populated/valid.
+
+        * platform/mac-wk2/TestExpectations:
+
 2020-06-16  Diego Pino Garcia  <[email protected]>
 
         [WPE] Unreviewed test gardening. Update baselines after r263073.

Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-page-aggressive-gc-expected.txt (263077 => 263078)


--- trunk/LayoutTests/http/tests/inspector/network/har/har-page-aggressive-gc-expected.txt	2020-06-16 07:15:30 UTC (rev 263077)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-page-aggressive-gc-expected.txt	2020-06-16 07:18:57 UTC (rev 263078)
@@ -14,7 +14,7 @@
       {
         "startedDateTime": "<filtered>",
         "id": "page_0",
-        "title": "http://127.0.0.1:8000/inspector/network/har/har-page.html",
+        "title": "http://127.0.0.1:8000/inspector/network/har/har-page-aggressive-gc.html",
         "pageTimings": {
           "onContentLoad": "<filtered>",
           "onLoad": "<filtered>"
@@ -28,7 +28,7 @@
         "time": "<filtered>",
         "request": {
           "method": "GET",
-          "url": "http://127.0.0.1:8000/inspector/network/har/har-page.html",
+          "url": "http://127.0.0.1:8000/inspector/network/har/har-page-aggressive-gc.html",
           "httpVersion": "<filtered>",
           "cookies": [],
           "headers": "<filtered>",

Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-page-aggressive-gc.html (263077 => 263078)


--- trunk/LayoutTests/http/tests/inspector/network/har/har-page-aggressive-gc.html	2020-06-16 07:15:30 UTC (rev 263077)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-page-aggressive-gc.html	2020-06-16 07:18:57 UTC (rev 263078)
@@ -83,16 +83,26 @@
         name: "HAR.Basic.Page",
         description: "Should be able to generate a HAR with all of this test page's resources.",
         async test() {
-            InspectorTest.reloadPage({ignoreCache: true});
-            await InspectorTest.awaitEvent("LoadComplete");
-            InspectorTest.evaluateInPage("setup()");
-            await InspectorTest.awaitEvent("SetupComplete");
+            await NetworkAgent.setResourceCachingDisabled(true);
 
+            await Promise.all([
+                InspectorTest.awaitEvent("LoadComplete"),
+                InspectorTest.reloadPage({ignoreCache: true}),
+            ]);
+
+            await Promise.all([
+                InspectorTest.awaitEvent("SetupComplete"),
+                InspectorTest.evaluateInPage(`setup()`),
+            ]);
+
             let resources = [WI.networkManager.mainFrame.mainResource, ...WI.networkManager.mainFrame.resourceCollection];
             let har = await WI.HARBuilder.buildArchive(resources);
             InspectorTest.json(har, HARJSONFilter);
-            InspectorTest.evaluateInPage("cleanup()");
-            await InspectorTest.awaitEvent("CleanComplete");
+
+            await Promise.all([
+                InspectorTest.awaitEvent("CleanComplete"),
+                InspectorTest.evaluateInPage(`cleanup()`),
+            ]);
         }
     });
 

Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-page.html (263077 => 263078)


--- trunk/LayoutTests/http/tests/inspector/network/har/har-page.html	2020-06-16 07:15:30 UTC (rev 263077)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-page.html	2020-06-16 07:18:57 UTC (rev 263078)
@@ -83,16 +83,26 @@
         name: "HAR.Basic.Page",
         description: "Should be able to generate a HAR with all of this test page's resources.",
         async test() {
-            InspectorTest.reloadPage({ignoreCache: true});
-            await InspectorTest.awaitEvent("LoadComplete");
-            InspectorTest.evaluateInPage("setup()");
-            await InspectorTest.awaitEvent("SetupComplete");
+            await NetworkAgent.setResourceCachingDisabled(true);
 
+            await Promise.all([
+                InspectorTest.awaitEvent("LoadComplete"),
+                InspectorTest.reloadPage({ignoreCache: true}),
+            ]);
+
+            await Promise.all([
+                InspectorTest.awaitEvent("SetupComplete"),
+                InspectorTest.evaluateInPage(`setup()`),
+            ]);
+
             let resources = [WI.networkManager.mainFrame.mainResource, ...WI.networkManager.mainFrame.resourceCollection];
             let har = await WI.HARBuilder.buildArchive(resources);
             InspectorTest.json(har, HARJSONFilter);
-            InspectorTest.evaluateInPage("cleanup()");
-            await InspectorTest.awaitEvent("CleanComplete");
+
+            await Promise.all([
+                InspectorTest.awaitEvent("CleanComplete"),
+                InspectorTest.evaluateInPage(`cleanup()`),
+            ]);
         }
     });
 

Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (263077 => 263078)


--- trunk/LayoutTests/platform/mac-wk2/TestExpectations	2020-06-16 07:15:30 UTC (rev 263077)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations	2020-06-16 07:18:57 UTC (rev 263078)
@@ -959,9 +959,6 @@
 
 webkit.org/b/207938 http/wpt/crypto/derive-hmac-key-crash.any.html [ Pass Crash ]
 
-webkit.org/b/207954 http/tests/inspector/network/har/har-page.html [ Pass Failure ]
-webkit.org/b/207954 http/tests/inspector/network/har/har-page-aggressive-gc.html [ Pass Failure ]
-
 webkit.org/b/207962 accessibility/mac/aria-menu-item-selected-notification.html [ Slow ]
 
 webkit.org/b/208005 webgpu/whlsl/zero-initialize-values.html [ Pass ImageOnlyFailure ]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to