Changeset 234107 in webkit

Timestamp:

Jul 23, 2018 12:33:13 PM (6 years ago)

Author:

Chris Dumez

Message:

REGRESSION(PSON?): [ WK2 ] http/tests/workers/service/client-*-page-cache.html LayoutTests are flaky
​https://bugs.webkit.org/show_bug.cgi?id=183705
<rdar://problem/42440606>

Unreviewed, attempting a better fix for http/tests/workers/service/serviceworkerclients-matchAll.https.html.
If it fixes the flakiness I'll do the same for the 2 page cache tests.

• http/tests/workers/service/serviceworkerclients-matchAll-worker.js:

(waitFor):
(matchAllPromise2):
(async.doTestAfterMessage):
(matchAllPromise1): Deleted.
(then): Deleted.

• platform/ios-wk2/TestExpectations:
• platform/mac-wk2/TestExpectations:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/workers/service/serviceworkerclients-matchAll-worker.js (modified) (4 diffs)
• platform/ios-wk2/TestExpectations (modified) (1 diff)
• platform/mac-wk2/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-07-23  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION(PSON?): [ WK2 ] http/tests/workers/service/client-*-page-cache.html LayoutTests are flaky
+        https://bugs.webkit.org/show_bug.cgi?id=183705
+        <rdar://problem/42440606>
+
+        Unreviewed, attempting a better fix for http/tests/workers/service/serviceworkerclients-matchAll.https.html.
+        If it fixes the flakiness I'll do the same for the 2 page cache tests.
+
+        * http/tests/workers/service/serviceworkerclients-matchAll-worker.js:
+        (waitFor):
+        (matchAllPromise2):
+        (async.doTestAfterMessage):
+        (matchAllPromise1): Deleted.
+        (then): Deleted.
+        * platform/ios-wk2/TestExpectations:
+        * platform/mac-wk2/TestExpectations:
+
 2018-07-23  Per Arne Vollan  <pvollan@apple.com>
 

trunk/LayoutTests/http/tests/workers/service/serviceworkerclients-matchAll-worker.js

@@ +1 @@
+function waitFor(duration)
+{
+    return new Promise((resolve) => setTimeout(resolve, duration));
+}
+
 function matchAllPromise1()
 {
@@ -9 +14 @@
 
 var matchedClients;
-matchAllPromise2 = self.clients.matchAll({ includeUncontrolled : true }).then((c) => {
-    matchedClients = c;
-    return matchedClients.length === 1 ? "PASS" : "FAIL: expected one matched client, got " + matchedClients.length;
-}, (e) => {
-    return "FAIL: matchAll 2 rejected with " + e;
-});
+function matchAllPromise2()
+{
+    return self.clients.matchAll({ includeUncontrolled : true }).then((c) => {
+        matchedClients = c;
+        return matchedClients.length === 1 ? "PASS" : "FAIL: expected one matched client, got " + matchedClients.length;
+    }, (e) => {
+        return "FAIL: matchAll 2 rejected with " + e;
+    });
+}
 
 async function doTestAfterMessage(event)
@@ -29 +37 @@
                 await waitFor(50);
             result = await matchAllPromise1();
-        } while (result !== "PASS" && ++tries <= 20);
+        } while (result !== "PASS" && ++tries <= 200);
 
         if (result !== "PASS") {
@@ -36 +44 @@
         }
 
-        var result = await matchAllPromise2;
+        tries = 0;
+        do {
+            if (tries)
+                await waitFor(50);
+            result = await matchAllPromise2();
+        } while (result !== "PASS" && ++tries <= 200);
+
         if (result !== "PASS") {
             event.source.postMessage(result);

trunk/LayoutTests/platform/ios-wk2/TestExpectations

@@ -1359 +1359 @@
 webkit.org/b/183705 http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html [ Pass Failure ]
 webkit.org/b/183705 http/tests/workers/service/client-removed-from-clients-while-in-page-cache.html [ Pass Failure ]
-webkit.org/b/183705 http/tests/workers/service/serviceworkerclients-matchAll.https.html [ Pass Failure ]

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -887 +887 @@
 webkit.org/b/183705 http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html [ Pass Failure ]
 webkit.org/b/183705 http/tests/workers/service/client-removed-from-clients-while-in-page-cache.html [ Pass Failure ]
-webkit.org/b/183705 http/tests/workers/service/serviceworkerclients-matchAll.https.html [ Pass Failure ]
 
 webkit.org/b/187658 http/tests/security/bypassing-cors-checks-for-extension-urls.html [ Pass Failure ]