Changeset 234061 in webkit

Timestamp:

Jul 20, 2018 12:34:09 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

Reviewed by Youenn Fablet.

At the beginning of the tests, wait for the client count to reach the expected value instead of
expecting it to be the right value right away. Clients unregister themselves asynchronously so
it is flaky otherwise.

• http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html:
• http/tests/workers/service/client-removed-from-clients-while-in-page-cache.html:
• http/tests/workers/service/serviceworkerclients-matchAll-worker.js:

(async.doTestAfterMessage):

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html (modified) (1 diff)
• http/tests/workers/service/client-removed-from-clients-while-in-page-cache.html (modified) (1 diff)
• http/tests/workers/service/serviceworkerclients-matchAll-worker.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-07-20  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
+
+        Reviewed by Youenn Fablet.
+
+        At the beginning of the tests, wait for the client count to reach the expected value instead of
+        expecting it to be the right value right away. Clients unregister themselves asynchronously so
+        it is flaky otherwise.
+
+        * http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html:
+        * http/tests/workers/service/client-removed-from-clients-while-in-page-cache.html:
+        * http/tests/workers/service/serviceworkerclients-matchAll-worker.js:
+        (async.doTestAfterMessage):
+
 2018-07-20  Basuke Suzuki  <Basuke.Suzuki@sony.com>
 

trunk/LayoutTests/http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html

@@ -12 +12 @@
 }
 
+let tries = 0;
+
 navigator.serviceWorker.addEventListener("message", function(event) {
   if (step == "BothClientsInitiallyActive") {
     if (event.data != 2) {
-      log("FAIL: Wrong initial number of clients: " + event.data);
-      finishSWTest();
+      if (++tries > 20) {
+          log("FAIL: Wrong initial number of clients: " + event.data);
+          finishSWTest();
+          return;
+      }
+      worker.postMessage("getClientCount");
       return;
     }

trunk/LayoutTests/http/tests/workers/service/client-removed-from-clients-while-in-page-cache.html

@@ -12 +12 @@
 }
 
+let tries = 0;
+
 navigator.serviceWorker.addEventListener("message", function(event) {
   if (step == "BothClientsInitiallyActive") {
     if (event.data != 2) {
-      log("FAIL: Wrong initial number of clients: " + event.data);
-      finishSWTest();
+      if (++tries > 20) {
+          log("FAIL: Wrong initial number of clients: " + event.data);
+          finishSWTest();
+          return;
+      }
+      worker.postMessage("getClientCount");
       return;
     }

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

@@ -1 @@
-var matchAllPromise1 = self.clients.matchAll().then((clients) => {
-    return clients.length === 0 ? "PASS" : "FAIL: expected no matched client, got " + clients.length;
-}, (e) => {
-    return "FAIL: matchAll 1 rejected with " + e;
-});
-
+function matchAllPromise1()
+{
+    return self.clients.matchAll().then((clients) => {
+        return clients.length === 0 ? "PASS" : "FAIL: expected no matched client, got " + clients.length;
+    }, (e) => {
+        return "FAIL: matchAll 1 rejected with " + e;
+    });
+}
 
 var matchedClients;
@@ -22 +24 @@
         }
 
-        var result = await matchAllPromise1;
+        let tries = 0;
+        do {
+            if (tries)
+                await waitFor(50);
+            result = await matchAllPromise1();
+        } while (result !== "PASS" && ++tries <= 20);
+
         if (result !== "PASS") {
             event.source.postMessage(result);