<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[277460] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/277460">277460</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-05-13 16:16:00 -0700 (Thu, 13 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Tweak ServiceWorkers.SuspendServiceWorkerProcessBasedOnClientProcesses to find out source of timeout
https://bugs.webkit.org/show_bug.cgi?id=225770

Reviewed by Alexey Proskuryakov.

Wait for conditions with our own timeout so that the test fails with useful errors instead
of just a generic timeout. This just help us find out where in the test things go wrong.

* TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaServiceWorkerBasicmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277459 => 277460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-13 23:11:06 UTC (rev 277459)
+++ trunk/Tools/ChangeLog       2021-05-13 23:16:00 UTC (rev 277460)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-05-13  Chris Dumez  <cdumez@apple.com>
+
+        Tweak ServiceWorkers.SuspendServiceWorkerProcessBasedOnClientProcesses to find out source of timeout
+        https://bugs.webkit.org/show_bug.cgi?id=225770
+
+        Reviewed by Alexey Proskuryakov.
+
+        Wait for conditions with our own timeout so that the test fails with useful errors instead
+        of just a generic timeout. This just help us find out where in the test things go wrong.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
+
</ins><span class="cx"> 2021-05-13  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Add unit test using WKHTTPCookieStoreObserver and cookies received from HTTP
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaServiceWorkerBasicmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (277459 => 277460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm        2021-05-13 23:11:06 UTC (rev 277459)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm   2021-05-13 23:16:00 UTC (rev 277460)
</span><span class="lines">@@ -1441,13 +1441,15 @@
</span><span class="cx">     done = false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void waitUntilServiceWorkerProcessCount(WKProcessPool *processPool, unsigned processCount)
</del><ins>+static bool waitUntilEvaluatesToTrue(const Function<bool()>& f)
</ins><span class="cx"> {
</span><ins>+    unsigned timeout = 0;
</ins><span class="cx">     do {
</span><del>-        if (processPool._serviceWorkerProcessCount == processCount)
-            return;
-        TestWebKitAPI::Util::spinRunLoop(1);
-    } while (true);
</del><ins>+        if (f())
+            return true;
+        TestWebKitAPI::Util::sleep(0.1);
+    } while (++timeout < 100);
+    return false;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(ServiceWorkers, ProcessPerSite)
</span><span class="lines">@@ -1523,7 +1525,7 @@
</span><span class="cx">     NSURLRequest *aboutBlankRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]];
</span><span class="cx">     [webView4 loadRequest:aboutBlankRequest];
</span><span class="cx"> 
</span><del>-    waitUntilServiceWorkerProcessCount(processPool, 1);
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return [processPool _serviceWorkerProcessCount] == 1; }));
</ins><span class="cx">     EXPECT_EQ(1U, processPool._serviceWorkerProcessCount);
</span><span class="cx"> 
</span><span class="cx">     [webView2 loadRequest:aboutBlankRequest];
</span><span class="lines">@@ -1532,7 +1534,7 @@
</span><span class="cx"> 
</span><span class="cx">     [webView1 loadRequest:aboutBlankRequest];
</span><span class="cx">     [webView3 loadRequest:aboutBlankRequest];
</span><del>-    waitUntilServiceWorkerProcessCount(processPool, 0);
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return ![processPool _serviceWorkerProcessCount]; }));
</ins><span class="cx">     EXPECT_EQ(0U, processPool._serviceWorkerProcessCount);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1570,7 +1572,7 @@
</span><span class="cx">     [webView1 loadRequest:server1.request()];
</span><span class="cx">     [webView2 loadRequest:server2.requestWithLocalhost()];
</span><span class="cx"> 
</span><del>-    waitUntilServiceWorkerProcessCount(processPool, 2);
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return [processPool _serviceWorkerProcessCount] == 2; }));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static size_t launchServiceWorkerProcess(bool useSeparateServiceWorkerProcess, bool loadAboutBlankBeforePage)
</span><span class="lines">@@ -1613,7 +1615,7 @@
</span><span class="cx"> 
</span><span class="cx">     [webView loadRequest:server.request()];
</span><span class="cx"> 
</span><del>-    waitUntilServiceWorkerProcessCount(processPool, 1);
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return [processPool _serviceWorkerProcessCount] == 1; }));
</ins><span class="cx">     return webView.get().configuration.processPool._webProcessCountIgnoringPrewarmed;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1649,24 +1651,6 @@
</span><span class="cx">     EXPECT_EQ(2u, launchServiceWorkerProcess(useSeparateServiceWorkerProcess, firstLoadAboutBlank));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void waitUntilServiceWorkerProcessForegroundActivityState(WKWebView *page, bool shouldHaveActivity)
-{
-    do {
-        if (page._hasServiceWorkerForegroundActivityForTesting == shouldHaveActivity)
-            return;
-        TestWebKitAPI::Util::spinRunLoop(1);
-    } while (true);
-}
-
-void waitUntilServiceWorkerProcessBackgroundActivityState(WKWebView *page, bool shouldHaveActivity)
-{
-    do {
-        if (page._hasServiceWorkerBackgroundActivityForTesting == shouldHaveActivity)
-            return;
-        TestWebKitAPI::Util::spinRunLoop(1);
-    } while (true);
-}
-
</del><span class="cx"> enum class UseSeparateServiceWorkerProcess : bool { No, Yes };
</span><span class="cx"> void testSuspendServiceWorkerProcessBasedOnClientProcesses(UseSeparateServiceWorkerProcess useSeparateServiceWorkerProcess)
</span><span class="cx"> {
</span><span class="lines">@@ -1696,7 +1680,7 @@
</span><span class="cx"> 
</span><span class="cx">     [webView loadRequest:server.request()];
</span><span class="cx"> 
</span><del>-    waitUntilServiceWorkerProcessCount(processPool, 1);
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return [processPool _serviceWorkerProcessCount] == 1; }));
</ins><span class="cx"> 
</span><span class="cx">     auto webView2 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
</span><span class="cx">     [webView2 loadRequest:server.request()];
</span><span class="lines">@@ -1703,16 +1687,16 @@
</span><span class="cx"> 
</span><span class="cx">     auto webViewToUpdate = useSeparateServiceWorkerProcess == UseSeparateServiceWorkerProcess::Yes ? webView : webView2;
</span><span class="cx">     [webViewToUpdate _setAssertionTypeForTesting: 1];
</span><del>-    waitUntilServiceWorkerProcessForegroundActivityState(webViewToUpdate.get(), false);
-    waitUntilServiceWorkerProcessBackgroundActivityState(webViewToUpdate.get(), true);
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return ![webViewToUpdate _hasServiceWorkerForegroundActivityForTesting]; }));
+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return [webViewToUpdate _hasServiceWorkerBackgroundActivityForTesting]; }));
</ins><span class="cx"> 
</span><span class="cx">     [webViewToUpdate _setAssertionTypeForTesting: 3];
</span><del>-    waitUntilServiceWorkerProcessForegroundActivityState(webViewToUpdate.get(), true);
-    waitUntilServiceWorkerProcessBackgroundActivityState(webViewToUpdate.get(), false);
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return [webViewToUpdate _hasServiceWorkerForegroundActivityForTesting]; }));
+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return ![webViewToUpdate _hasServiceWorkerBackgroundActivityForTesting]; }));
</ins><span class="cx"> 
</span><span class="cx">     [webViewToUpdate _setAssertionTypeForTesting: 0];
</span><del>-    waitUntilServiceWorkerProcessBackgroundActivityState(webViewToUpdate.get(), false);
-    waitUntilServiceWorkerProcessForegroundActivityState(webViewToUpdate.get(), false);
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return ![webViewToUpdate _hasServiceWorkerForegroundActivityForTesting]; }));
+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] { return ![webViewToUpdate _hasServiceWorkerBackgroundActivityForTesting]; }));
</ins><span class="cx"> 
</span><span class="cx">     [webView _close];
</span><span class="cx">     webView = nullptr;
</span><span class="lines">@@ -1719,20 +1703,20 @@
</span><span class="cx"> 
</span><span class="cx">     // The service worker process should take activity based on webView2 process.
</span><span class="cx">     [webView2 _setAssertionTypeForTesting: 1];
</span><del>-    while (webView2.get()._hasServiceWorkerForegroundActivityForTesting || !webView2.get()._hasServiceWorkerBackgroundActivityForTesting) {
-        [webView2 _setAssertionTypeForTesting: 1];
-        TestWebKitAPI::Util::spinRunLoop(1);
-    }
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] {
+        [webView2 _setAssertionTypeForTesting:1];
+        return ![webView2 _hasServiceWorkerForegroundActivityForTesting] && [webView2 _hasServiceWorkerBackgroundActivityForTesting];
+    }));
</ins><span class="cx"> 
</span><del>-    while (!webView2.get()._hasServiceWorkerForegroundActivityForTesting || webView2.get()._hasServiceWorkerBackgroundActivityForTesting) {
-        [webView2 _setAssertionTypeForTesting: 3];
-        TestWebKitAPI::Util::spinRunLoop(1);
-    }
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] {
+        [webView2 _setAssertionTypeForTesting:3];
+        return [webView2 _hasServiceWorkerForegroundActivityForTesting] && ![webView2 _hasServiceWorkerBackgroundActivityForTesting];
+    }));
</ins><span class="cx"> 
</span><del>-    while (webView2.get()._hasServiceWorkerForegroundActivityForTesting || webView2.get()._hasServiceWorkerBackgroundActivityForTesting) {
-        [webView2 _setAssertionTypeForTesting: 0];
-        TestWebKitAPI::Util::spinRunLoop(1);
-    }
</del><ins>+    EXPECT_TRUE(waitUntilEvaluatesToTrue([&] {
+        [webView2 _setAssertionTypeForTesting:0];
+        return ![webView2 _hasServiceWorkerForegroundActivityForTesting] && ![webView2 _hasServiceWorkerBackgroundActivityForTesting];
+    }));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(ServiceWorkers, SuspendServiceWorkerProcessBasedOnClientProcessesWithSeparateServiceWorkerProcess)
</span></span></pre>
</div>
</div>

</body>
</html>