Changeset 246012 in webkit

Timestamp:

May 31, 2019, 9:33:04 PM (7 years ago)

Author:

sihui_liu@apple.com

Message:

TestWebKitAPI.WKWebView.LocalStorageProcessSuspends is flaky
​https://bugs.webkit.org/show_bug.cgi?id=198450

Reviewed by Ryosuke Niwa.

In local-storage-process-suspends-2.html, we periodically checked local storage item and sent a message when the
item value was changed or times of check reached limit. We expected the message to be sent after network process
resumed from suspension, because that's when the item value should get updated. However, the limit we set seemed
to be not high enough, so that the message could be sent eariler than expected, when limit of check number was
reached.

We can solve this in different ways. To make the test robust, we can send the message on a storage event, which
notifies about changes in local storage.

• TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm:

(TEST):

• TestWebKitAPI/Tests/WebKitCocoa/local-storage-process-suspends-2.html:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm (modified) (2 diffs)
• TestWebKitAPI/Tests/WebKitCocoa/local-storage-process-suspends-2.html (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-31  Sihui Liu  <sihui_liu@apple.com>
+
+        TestWebKitAPI.WKWebView.LocalStorageProcessSuspends is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=198450
+
+        Reviewed by Ryosuke Niwa.
+
+        In local-storage-process-suspends-2.html, we periodically checked local storage item and sent a message when the
+        item value was changed or times of check reached limit. We expected the message to be sent after network process
+        resumed from suspension, because that's when the item value should get updated. However, the limit we set seemed
+        to be not high enough, so that the message could be sent eariler than expected, when limit of check number was 
+        reached.
+
+        We can solve this in different ways. To make the test robust, we can send the message on a storage event, which
+        notifies about changes in local storage.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm:
+        (TEST):
+        * TestWebKitAPI/Tests/WebKitCocoa/local-storage-process-suspends-2.html:
+
 2019-05-31  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm

@@ -112 +112 @@
     RetainPtr<WKProcessPool> processPool = adoptNS([[WKProcessPool alloc] init]);
     [configuration setProcessPool:processPool.get()];
+    [configuration _setAllowUniversalAccessFromFileURLs:YES];
 
     RetainPtr<WKWebView> webView1 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
@@ -139 +140 @@
     readyToContinue = false;
     [webView2 evaluateJavaScript:@"window.localStorage.getItem('key')" completionHandler:^(id result, NSError *) {
-        EXPECT_TRUE([@"value" isEqualToString:result]);
+        EXPECT_WK_STREQ(@"value", result);
         readyToContinue = true;
     }];

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/local-storage-process-suspends-2.html

@@ -2 +2 @@
 <script>
 
-var startValue = window.localStorage.getItem('key');
-window.webkit.messageHandlers.testHandler.postMessage(startValue);
+function checkLocalStorage(event) {
+    window.webkit.messageHandlers.testHandler.postMessage(window.localStorage.getItem('key'));
+}
 
-var tries = 10;
-var intervalID = setInterval(()=> {
-    var newValue = window.localStorage.getItem('key');
-    if (newValue != startValue || tries == 0) {
-        window.webkit.messageHandlers.testHandler.postMessage(newValue);
-        clearInterval(intervalID);
-    }
-    --tries;
-}, 100);
+checkLocalStorage();
+window.addEventListener("storage", checkLocalStorage);
 
 </script>