Attachment 346950 Details for Bug 168091 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

workers-2.patch (text/plain), 9.98 KB, created by Joseph Pecoraro on 2018-08-10 19:00:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2018-08-10 19:00:39 PDT

Size: 9.98 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c0a359dae86..61007f7b60c 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-08-10  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        [macOS debug] LayoutTest inspector/worker/resources-in-worker.html is a flaky timeout
>+        https://bugs.webkit.org/show_bug.cgi?id=168091
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * inspector/worker/resources-in-worker-expected.txt:
>+        * inspector/worker/resources-in-worker.html:
>+        * inspector/worker/resources/resource-utilities.js:
>+        * inspector/worker/resources/worker-resources.js:
>+        Be a little more careful about proceeding with tests after starting the Worker.
>+        Fix the resource load from the main target to actually load a real resource.
>+
>+        * platform/gtk/TestExpectations:
>+        * platform/mac/TestExpectations:
>+        This test always passes for me in Release and Debug. Reset expectations.
>+
> 2018-08-10  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         LayoutTest inspector/worker/debugger-pause.html is a flaky failure
>diff --git a/LayoutTests/inspector/dom-debugger/resources/dataXHR.json b/LayoutTests/inspector/dom-debugger/resources/dataXHR.json
>new file mode 100644
>index 00000000000..a9981b939b8
>--- /dev/null
>+++ b/LayoutTests/inspector/dom-debugger/resources/dataXHR.json
>@@ -0,0 +1 @@
>+{"webkit":true, "type":"XHR"}
>diff --git a/LayoutTests/inspector/dom-debugger/xhr-breakpoints.html b/LayoutTests/inspector/dom-debugger/xhr-breakpoints.html
>index e1591c39042..e765ea5d794 100644
>--- a/LayoutTests/inspector/dom-debugger/xhr-breakpoints.html
>+++ b/LayoutTests/inspector/dom-debugger/xhr-breakpoints.html
>@@ -69,7 +69,7 @@ function test()
>             WI.domDebuggerManager.allRequestsBreakpoint.disabled = false;
> 
>             InspectorTest.log("Sending XMLHttpRequest.");
>-            InspectorTest.evaluateInPage("loadResourceXHR()");
>+            InspectorTest.evaluateInPage(`loadResourceXHR("resources/dataXHR.json")`);
> 
>             WI.debuggerManager.awaitEvent(WI.DebuggerManager.Event.Paused)
>             .then(() => {
>@@ -97,7 +97,7 @@ function test()
>                 expectedBreakpointURL = breakpoint.url;
> 
>                 InspectorTest.log("Sending XMLHttpRequest.");
>-                InspectorTest.evaluateInPage("loadResourceXHR()");
>+                InspectorTest.evaluateInPage(`loadResourceXHR("resources/dataXHR.json")`);
>                 return WI.debuggerManager.awaitEvent(WI.DebuggerManager.Event.Paused);
>             })
>             .then(() => {
>@@ -125,7 +125,7 @@ function test()
>                 expectedBreakpointURL = breakpoint.url;
> 
>                 InspectorTest.log("Sending XMLHttpRequest.");
>-                InspectorTest.evaluateInPage("loadResourceXHR()");
>+                InspectorTest.evaluateInPage(`loadResourceXHR("resources/dataXHR.json")`);
>                 return WI.debuggerManager.awaitEvent(WI.DebuggerManager.Event.Paused);
>             })
>             .then(() => {
>@@ -153,7 +153,7 @@ function test()
>                 InspectorTest.log("Breakpoint disabled.");
> 
>                 InspectorTest.log("Sending XMLHttpRequest.");
>-                return Promise.race([awaitEvaluateInPage("loadResourceXHR()"), rejectOnPause()]);
>+                return Promise.race([awaitEvaluateInPage(`loadResourceXHR("resources/dataXHR.json")`), rejectOnPause()]);
>             })
>             .then(() => {
>                 InspectorTest.pass("Should not pause for disabled breakpoint.");
>@@ -171,7 +171,7 @@ function test()
>             addBreakpoint(WI.XHRBreakpoint.Type.Text, "nonexistant-url")
>             .then((breakpoint) => {
>                 InspectorTest.log("Sending XMLHttpRequest.");
>-                return Promise.race([awaitEvaluateInPage("loadResourceXHR()"), rejectOnPause()]);
>+                return Promise.race([awaitEvaluateInPage(`loadResourceXHR("resources/dataXHR.json")`), rejectOnPause()]);
>             })
>             .then(() => {
>                 InspectorTest.pass("Should not pause for breakpoint with different URL.");
>@@ -191,7 +191,7 @@ function test()
>                 WI.domDebuggerManager.removeXHRBreakpoint(breakpoint);
>                 InspectorTest.log("Breakpoint removed.");
> 
>-                return Promise.race([awaitEvaluateInPage("loadResourceXHR()"), rejectOnPause()]);
>+                return Promise.race([awaitEvaluateInPage(`loadResourceXHR("resources/dataXHR.json")`), rejectOnPause()]);
>             })
>             .then(() => {
>                 InspectorTest.pass("Should not pause for removed breakpoint.");
>@@ -213,7 +213,7 @@ function test()
>                 WI.domDebuggerManager.removeXHRBreakpoint(breakpoint);
>                 InspectorTest.log("Breakpoint removed.");
> 
>-                return Promise.race([awaitEvaluateInPage("loadResourceXHR()"), rejectOnPause()]);
>+                return Promise.race([awaitEvaluateInPage(`loadResourceXHR("resources/dataXHR.json")`), rejectOnPause()]);
>             })
>             .then(() => {
>                 InspectorTest.pass("Should not pause for removed disabled breakpoint.");
>diff --git a/LayoutTests/inspector/worker/resources-in-worker-expected.txt b/LayoutTests/inspector/worker/resources-in-worker-expected.txt
>index d4207d17337..3c2bc414410 100644
>--- a/LayoutTests/inspector/worker/resources-in-worker-expected.txt
>+++ b/LayoutTests/inspector/worker/resources-in-worker-expected.txt
>@@ -1,4 +1,3 @@
>-CONSOLE MESSAGE: line 1: Unhandled Promise Rejection: TypeError: The requested URL was not found on this server.
> Test for Resources in a Worker.
> 
> 
>diff --git a/LayoutTests/inspector/worker/resources-in-worker.html b/LayoutTests/inspector/worker/resources-in-worker.html
>index b2c567fda2d..2867771ef98 100644
>--- a/LayoutTests/inspector/worker/resources-in-worker.html
>+++ b/LayoutTests/inspector/worker/resources-in-worker.html
>@@ -15,7 +15,7 @@ function triggerWorkerStart() {
> }
> 
> function triggerMainResourceLoadXHR() {
>-    loadResourceXHR();
>+    loadResourceXHR("resources/dataXHR.json?main");
> }
> 
> function triggerWorkerResourceLoadXHR() {
>@@ -23,7 +23,7 @@ function triggerWorkerResourceLoadXHR() {
> }
> 
> function triggerMainResourceLoadFetch() {
>-    loadResourceFetch();
>+    loadResourceFetch("resources/dataFetch.json?main");
> }
> 
> function triggerWorkerResourceLoadFetch() {
>@@ -55,14 +55,24 @@ function test()
>         test(resolve, reject) {
>             InspectorTest.evaluateInPage("triggerWorkerStart()");
> 
>+            let workerIsReady = false;
>+            let workerTargetIsSet = false;
>+            function attemptResolve() {
>+                if (workerIsReady && workerTargetIsSet)
>+                    resolve();
>+            }
>+
>             WI.targetManager.singleFireEventListener(WI.TargetManager.Event.TargetAdded, (event) => {
>                 workerTarget = event.data.target;
>                 InspectorTest.assert(workerTarget instanceof WI.Target);
>                 InspectorTest.expectEqual(workerTarget.type, WI.Target.Type.Worker, "Added Target should have Worker type.");
>+                workerTargetIsSet = true;
>+                attemptResolve();
>             });
> 
>             InspectorTest.singleFireEventListener("WorkerIsReady", () => {
>-                resolve();
>+                workerIsReady = true;
>+                attemptResolve();
>             });
>         }
>     });
>diff --git a/LayoutTests/inspector/worker/resources/resource-utilities.js b/LayoutTests/inspector/worker/resources/resource-utilities.js
>index d33ef2649c8..b2a08cfc1ce 100644
>--- a/LayoutTests/inspector/worker/resources/resource-utilities.js
>+++ b/LayoutTests/inspector/worker/resources/resource-utilities.js
>@@ -1,9 +1,9 @@
>-function loadResourceXHR() {
>+function loadResourceXHR(path) {
>     let xhr = new XMLHttpRequest;
>-    xhr.open("GET", "dataXHR.json", true);
>+    xhr.open("GET", path, true);
>     xhr.send();
> }
> 
>-function loadResourceFetch() {
>-    fetch("dataFetch.json");
>+function loadResourceFetch(path) {
>+    fetch(path);
> }
>diff --git a/LayoutTests/inspector/worker/resources/worker-resources.js b/LayoutTests/inspector/worker/resources/worker-resources.js
>index a54d48025b9..d38da8a4aca 100644
>--- a/LayoutTests/inspector/worker/resources/worker-resources.js
>+++ b/LayoutTests/inspector/worker/resources/worker-resources.js
>@@ -6,9 +6,9 @@ function importScript() {
> 
> onmessage = function(event) {
>     if (event.data === "loadResourceXHR")
>-        loadResourceXHR();
>+        loadResourceXHR("dataXHR.json");
>     else if (event.data === "loadResourceFetch")
>-        loadResourceFetch();
>+        loadResourceFetch("dataFetch.json");
>     else if (event.data === "importScript")
>         importScript();
> }
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index 3522ef5a8f0..99028fb626f 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -3334,8 +3334,6 @@ webkit.org/b/176649 fast/text/international/synthesized-italic-vertical.html [ I
> webkit.org/b/177294 platform/gtk/fonts/fontconfig-aliasing-settings.html [ Failure ]
> webkit.org/b/177294 fast/text/fitzpatrick-combination.html [ ImageOnlyFailure ]
> 
>-webkit.org/b/175661 inspector/worker/resources-in-worker.html [ Failure ]
>-
> webkit.org/b/175662 inspector/canvas/recording-2d.html [ Failure ]
> 
> webkit.org/b/177934 fast/dom/HTMLLinkElement/preconnect-support.html [ Failure ]
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 9cb6a5dd3c2..b4f00d6bdc8 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -1112,7 +1112,6 @@ webkit.org/b/158006 inspector/console/console-time.html [ Pass Timeout ]
> webkit.org/b/183880 [ Debug ] inspector/console/messageAdded-from-named-evaluations.html [ Slow ]
> webkit.org/b/156634 inspector/formatting/formatting-javascript.html [ Pass Timeout ]
> webkit.org/b/158948 inspector/timeline [ Pass Timeout ]
>-webkit.org/b/168091 inspector/worker/resources-in-worker.html [ Pass Failure ]
> 
> webkit.org/b/187622 [ Debug ] inspector/view/asynchronous-layout.html [ Pass Timeout ]
>

Flags:

hi: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 168091: 346945 | 346948 | 346949 | 346950