Title: [242180] trunk/Tools
Revision
242180
Author
cdu...@apple.com
Date
2019-02-27 16:47:42 -0800 (Wed, 27 Feb 2019)

Log Message

Flaky API Test: TestWebKitAPI.ProcessSwap.NumberOfCachedProcesses
https://bugs.webkit.org/show_bug.cgi?id=195102

Reviewed by Geoffrey Garen.

If the number of processes is not yet what we expect, wait a bit and check again to give
processes some time to exit.

* TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (242179 => 242180)


--- trunk/Tools/ChangeLog	2019-02-28 00:43:38 UTC (rev 242179)
+++ trunk/Tools/ChangeLog	2019-02-28 00:47:42 UTC (rev 242180)
@@ -1,5 +1,17 @@
 2019-02-27  Chris Dumez  <cdu...@apple.com>
 
+        Flaky API Test: TestWebKitAPI.ProcessSwap.NumberOfCachedProcesses
+        https://bugs.webkit.org/show_bug.cgi?id=195102
+
+        Reviewed by Geoffrey Garen.
+
+        If the number of processes is not yet what we expect, wait a bit and check again to give
+        processes some time to exit.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
+
+2019-02-27  Chris Dumez  <cdu...@apple.com>
+
         Flaky API Test: TestWebKitAPI.ProcessSwap.NavigateToDataURLThenBack
         https://bugs.webkit.org/show_bug.cgi?id=194545
 

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm (242179 => 242180)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm	2019-02-28 00:43:38 UTC (rev 242179)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm	2019-02-28 00:47:42 UTC (rev 242180)
@@ -3089,9 +3089,7 @@
 
 TEST(ProcessSwap, NumberOfCachedProcesses)
 {
-    auto processPoolConfiguration = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
-    processPoolConfiguration.get().processSwapsOnNavigation = YES;
-    processPoolConfiguration.get().usesWebProcessCache = YES;
+    auto processPoolConfiguration = psonProcessPoolConfiguration();
     processPoolConfiguration.get().prewarmsProcessesAutomatically = NO;
     auto processPool = adoptNS([[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration.get()]);
 
@@ -3127,6 +3125,12 @@
     TestWebKitAPI::Util::run(&done);
     done = false;
 
+    int timeout = 10;
+    while ([processPool _webProcessCount] > (maxSuspendedPageCount + 2) && timeout > 0) {
+        TestWebKitAPI::Util::sleep(0.1);
+        --timeout;
+    }
+
     EXPECT_EQ(maxSuspendedPageCount + 2, [processPool _webProcessCount]);
     EXPECT_EQ(maxSuspendedPageCount + 1, [processPool _webProcessCountIgnoringPrewarmedAndCached]);
     EXPECT_FALSE([processPool _hasPrewarmedWebProcess]);
@@ -3137,6 +3141,12 @@
     }];
     TestWebKitAPI::Util::run(&readyToContinue);
 
+    timeout = 10;
+    while ([processPool _webProcessCount] > 1 && timeout > 0) {
+        TestWebKitAPI::Util::sleep(0.1);
+        --timeout;
+    }
+
     EXPECT_EQ(1u, [processPool _webProcessCount]);
     EXPECT_EQ(1u, [processPool _webProcessCountIgnoringPrewarmedAndCached]);
     EXPECT_FALSE([processPool _hasPrewarmedWebProcess]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to