Changeset 277392 in webkit

Timestamp:

May 12, 2021, 2:56:12 PM (5 years ago)

Author:

sihui_liu@apple.com

Message:

[ BigSur Release ] TestWebKitAPI.IndexedDB.KillWebProcessWithOpenConnection is a constant failure
​https://bugs.webkit.org/show_bug.cgi?id=225372
<rdar://problem/77532291>

Reviewed by Chris Dumez.

Ensure IDB data is cleared before test and make error logging more detailed.

• TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-1.html:
• TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-2.html:
• TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm: Listen to version change event because it

indicates that server starts handling second open request in KillWebProcessWithOpenConnection-2.html.
(-[IndexedDBWebProcessKillMessageHandler userContentController:didReceiveScriptMessage:]):
(getNextMessage):
(TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-1.html (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-2.html (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm (modified) (7 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-05-12  Sihui Liu  <sihui_liu@apple.com>
+
+        [ BigSur Release ] TestWebKitAPI.IndexedDB.KillWebProcessWithOpenConnection is a constant failure
+        https://bugs.webkit.org/show_bug.cgi?id=225372
+        <rdar://problem/77532291>
+
+        Reviewed by Chris Dumez.
+
+        Ensure IDB data is cleared before test and make error logging more detailed.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-1.html:
+        * TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-2.html:
+        * TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm: Listen to version change event because it 
+        indicates that server starts handling second open request in KillWebProcessWithOpenConnection-2.html.
+        (-[IndexedDBWebProcessKillMessageHandler userContentController:didReceiveScriptMessage:]):
+        (getNextMessage):
+        (TEST):
+
 2021-05-12  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-1.html

@@ -4 +4 @@
 request.onsuccess = () => {
     window.webkit.messageHandlers.testHandler.postMessage("Open Succeeded");
+    var db = event.target.result;
+    db.onversionchange = () => {
+        window.webkit.messageHandlers.testHandler.postMessage("Version Change");
+    }
 }
 request.onerror = () => {
-    window.webkit.messageHandlers.testHandler.postMessage("Open Failed");
+    window.webkit.messageHandlers.testHandler.postMessage("Open Failed: " + request.error);
 }
 </script>

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-2.html

@@ -6 +6 @@
     var secondRequest = window.indexedDB.open("TestIndexedDB", db.version + 1);
     secondRequest.onsuccess = (event) => {
-        window.webkit.messageHandlers.testHandler.postMessage("Second Open Succeeded Unexpectedly");
+        window.webkit.messageHandlers.testHandler.postMessage("Second Open Succeeded");
     }
-    secondRequest.onerror = (event) => {
-        window.webkit.messageHandlers.testHandler.postMessage("Second Open Failed Unexpectedly");
+    secondRequest.onerror = () => {
+        window.webkit.messageHandlers.testHandler.postMessage("Second Open Failed: " + secondRequest.error);
     }
-    window.webkit.messageHandlers.testHandler.postMessage("First Open Succeeded");
 }
 request.onerror = () => {
-    window.webkit.messageHandlers.testHandler.postMessage("First Open Failed");
+    window.webkit.messageHandlers.testHandler.postMessage("First Open Failed: " + request.error);
 }
 </script>

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

@@ -40 +40 @@
 
 static bool receivedScriptMessage;
-static Deque<RetainPtr<WKScriptMessage>> scriptMessages;
+static Deque<RetainPtr<NSString>> scriptMessages;
 
 @interface IndexedDBWebProcessKillMessageHandler : NSObject <WKScriptMessageHandler>
@@ -50 +50 @@
 {
     receivedScriptMessage = true;
-    scriptMessages.append(message);
+    scriptMessages.append([message body]);
 }
 
 @end
 
-static WKScriptMessage *getNextMessage()
+static RetainPtr<NSString> getNextMessage()
 {
     if (scriptMessages.isEmpty()) {
@@ -62 +62 @@
     }
 
-    return scriptMessages.takeFirst().autorelease();
+    return scriptMessages.takeFirst();
 }
 
@@ -76 +76 @@
     [webView loadRequest:request];
 
-    RetainPtr<NSString> string1 = (NSString *)[getNextMessage() body];
-    RetainPtr<NSString> string2 = (NSString *)[getNextMessage() body];
-    RetainPtr<NSString> string3 = (NSString *)[getNextMessage() body];
-    RetainPtr<NSString> string4 = (NSString *)[getNextMessage() body];
+    auto string1 = getNextMessage();
+    auto string2 = getNextMessage();
+    auto string3 = getNextMessage();
+    auto string4 = getNextMessage();
 
     // Make a new web view with a new web process to finish the test
@@ -87 +87 @@
     [webView2 loadRequest:request];
 
-    RetainPtr<NSString> string5 = (NSString *)[getNextMessage() body];
+    auto string5 = getNextMessage();
 
     // Kill the first web process to unblock the second web processes transaction from starting.
     [webView _killWebContentProcessAndResetState];
 
-    RetainPtr<NSString> string6 = (NSString *)[getNextMessage() body];
+    auto string6 = getNextMessage();
 
     EXPECT_WK_STREQ(@"UpgradeNeeded", string1.get());
@@ -108 +108 @@
     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
 
+    __block bool readyToContinue = false;
+    [configuration.get().websiteDataStore removeDataOfTypes:[NSSet setWithObjects:WKWebsiteDataTypeIndexedDBDatabases, nil] modifiedSince:[NSDate distantPast] completionHandler:^() {
+        readyToContinue = true;
+    }];
+    TestWebKitAPI::Util::run(&readyToContinue);
+
     auto webView1 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
     NSURLRequest *request1 = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"KillWebProcessWithOpenConnection-1" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
     [webView1 loadRequest:request1];
-    RetainPtr<NSString> string1 = (NSString *)[getNextMessage() body];
+    auto string1 = getNextMessage();
     EXPECT_WK_STREQ(@"Open Succeeded", string1.get());
 
@@ -117 +123 @@
     NSURLRequest *request2 = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"KillWebProcessWithOpenConnection-2" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
     [webView2 loadRequest:request2];
-    RetainPtr<NSString> string2 = (NSString *)[getNextMessage() body];
-    EXPECT_WK_STREQ(@"First Open Succeeded", string2.get());
+    auto string2 = getNextMessage();
+    EXPECT_WK_STREQ(@"Version Change", string2.get());
 
+    // Second database request in webView2 should not be processed.
     [webView2 _killWebContentProcessAndResetState];
     [webView1 _killWebContentProcessAndResetState];
 
-    TestWebKitAPI::Util::spinRunLoop(10);
-
     [webView1 reload];
-    RetainPtr<NSString> string3 = (NSString *)[getNextMessage() body];
+    auto string3 = getNextMessage();
     EXPECT_WK_STREQ(@"Open Succeeded", string3.get());
 }