Changeset 256537 in webkit

Timestamp:

Feb 13, 2020 1:41:56 PM (4 years ago)

Author:

youenn@apple.com

Message:

REGRESSION: (256381) [ macOS ] http/tests/workers/service/serviceworkerclients-claim.https.html is flaky failing
​https://bugs.webkit.org/show_bug.cgi?id=207653
<rdar://problem/59396225>

Reviewed by Chris Dumez.

console log message output was flaky.
Make sure to end the fetch and post a message so that the console log message will appear in the expected.txt reliably.

• http/tests/workers/service/serviceworkerclients-claim.https-expected.txt:
• http/tests/workers/service/serviceworkerclients-claim.https.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/workers/service/serviceworkerclients-claim.https-expected.txt (modified) (1 diff)
• http/tests/workers/service/serviceworkerclients-claim.https.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-02-13  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION: (256381) [ macOS ] http/tests/workers/service/serviceworkerclients-claim.https.html is flaky failing
+        https://bugs.webkit.org/show_bug.cgi?id=207653
+        <rdar://problem/59396225>
+
+        Reviewed by Chris Dumez.
+
+        console log message output was flaky.
+        Make sure to end the fetch and post a message so that the console log message will appear in the expected.txt reliably.
+
+        * http/tests/workers/service/serviceworkerclients-claim.https-expected.txt:
+        * http/tests/workers/service/serviceworkerclients-claim.https.html:
+
 2020-02-13  Jason Lawrence  <lawrence.j@apple.com>
 

trunk/LayoutTests/http/tests/workers/service/serviceworkerclients-claim.https-expected.txt

@@ -1 +1 @@
 CONSOLE MESSAGE: Origin null is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Fetch API cannot load https://127.0.0.1:8443/pinkelephant due to access control checks.
-CONSOLE MESSAGE: line 1: Unhandled Promise Rejection: TypeError: Origin null is not allowed by Access-Control-Allow-Origin.
 
 

trunk/LayoutTests/http/tests/workers/service/serviceworkerclients-claim.https.html

@@ -55 +55 @@
   '    window.parent.postMessage(text, "*");' +
   '}' +
-  'doTest();' +
+  'doTest().catch(e => {' +
+  '   window.parent.postMessage("Fetch failed", "*");'+
+  '});' +
   '</scr' + 'ipt></h' + 'tml>';
 
 promise_test(async (test) => {
-    var promise = new Promise((resolve, reject) => {
-        window.addEventListener("message", (event) => {
-            reject("Received a message from iframe:" + event.data);
-        }, false);
-        setTimeout(resolve, 100);
+    var promise = new Promise((resolve) => {
+        window.addEventListener("message", (event) => resolve(event.data));
     });
     var frame = await withFrame("data:text/html," + htmlString);
-    return promise;
+    assert_equals(await promise, "Fetch failed");
 }, "Test data URL frame");