<!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>[277392] 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/277392">277392</a></dd>
<dt>Author</dt> <dd>sihui_liu@apple.com</dd>
<dt>Date</dt> <dd>2021-05-12 14:56:12 -0700 (Wed, 12 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ 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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaKillWebProcessWithOpenConnection1html">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-1.html</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaKillWebProcessWithOpenConnection2html">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-2.html</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaWebProcessKillIDBCleanupmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277391 => 277392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-12 21:43:31 UTC (rev 277391)
+++ trunk/Tools/ChangeLog       2021-05-12 21:56:12 UTC (rev 277392)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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):
+
</ins><span class="cx"> 2021-05-12  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [TestWebKitAPI] Explicitly exit after completing tests
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaKillWebProcessWithOpenConnection1html"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-1.html (277391 => 277392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-1.html      2021-05-12 21:43:31 UTC (rev 277391)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-1.html 2021-05-12 21:56:12 UTC (rev 277392)
</span><span class="lines">@@ -3,8 +3,12 @@
</span><span class="cx"> var request = window.indexedDB.open("TestIndexedDB");
</span><span class="cx"> request.onsuccess = () => {
</span><span class="cx">     window.webkit.messageHandlers.testHandler.postMessage("Open Succeeded");
</span><ins>+    var db = event.target.result;
+    db.onversionchange = () => {
+        window.webkit.messageHandlers.testHandler.postMessage("Version Change");
+    }
</ins><span class="cx"> }
</span><span class="cx"> request.onerror = () => {
</span><del>-    window.webkit.messageHandlers.testHandler.postMessage("Open Failed");
</del><ins>+    window.webkit.messageHandlers.testHandler.postMessage("Open Failed: " + request.error);
</ins><span class="cx"> }
</span><del>-</script>
</del><span class="cx">\ No newline at end of file
</span><ins>+</script>
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaKillWebProcessWithOpenConnection2html"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-2.html (277391 => 277392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-2.html      2021-05-12 21:43:31 UTC (rev 277391)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/KillWebProcessWithOpenConnection-2.html 2021-05-12 21:56:12 UTC (rev 277392)
</span><span class="lines">@@ -5,14 +5,13 @@
</span><span class="cx">     db = event.target.result;
</span><span class="cx">     var secondRequest = window.indexedDB.open("TestIndexedDB", db.version + 1);
</span><span class="cx">     secondRequest.onsuccess = (event) => {
</span><del>-        window.webkit.messageHandlers.testHandler.postMessage("Second Open Succeeded Unexpectedly");
</del><ins>+        window.webkit.messageHandlers.testHandler.postMessage("Second Open Succeeded");
</ins><span class="cx">     }
</span><del>-    secondRequest.onerror = (event) => {
-        window.webkit.messageHandlers.testHandler.postMessage("Second Open Failed Unexpectedly");
</del><ins>+    secondRequest.onerror = () => {
+        window.webkit.messageHandlers.testHandler.postMessage("Second Open Failed: " + secondRequest.error);
</ins><span class="cx">     }
</span><del>-    window.webkit.messageHandlers.testHandler.postMessage("First Open Succeeded");
</del><span class="cx"> }
</span><span class="cx"> request.onerror = () => {
</span><del>-    window.webkit.messageHandlers.testHandler.postMessage("First Open Failed");
</del><ins>+    window.webkit.messageHandlers.testHandler.postMessage("First Open Failed: " + request.error);
</ins><span class="cx"> }
</span><del>-</script>
</del><span class="cx">\ No newline at end of file
</span><ins>+</script>
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaWebProcessKillIDBCleanupmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm (277391 => 277392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm  2021-05-12 21:43:31 UTC (rev 277391)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm     2021-05-12 21:56:12 UTC (rev 277392)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><span class="cx"> static bool receivedScriptMessage;
</span><del>-static Deque<RetainPtr<WKScriptMessage>> scriptMessages;
</del><ins>+static Deque<RetainPtr<NSString>> scriptMessages;
</ins><span class="cx"> 
</span><span class="cx"> @interface IndexedDBWebProcessKillMessageHandler : NSObject <WKScriptMessageHandler>
</span><span class="cx"> @end
</span><span class="lines">@@ -49,12 +49,12 @@
</span><span class="cx"> - (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
</span><span class="cx"> {
</span><span class="cx">     receivedScriptMessage = true;
</span><del>-    scriptMessages.append(message);
</del><ins>+    scriptMessages.append([message body]);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-static WKScriptMessage *getNextMessage()
</del><ins>+static RetainPtr<NSString> getNextMessage()
</ins><span class="cx"> {
</span><span class="cx">     if (scriptMessages.isEmpty()) {
</span><span class="cx">         receivedScriptMessage = false;
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">         TestWebKitAPI::Util::run(&receivedScriptMessage);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return scriptMessages.takeFirst().autorelease();
</del><ins>+    return scriptMessages.takeFirst();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(IndexedDB, WebProcessKillIDBCleanup)
</span><span class="lines">@@ -75,10 +75,10 @@
</span><span class="cx">     NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"WebProcessKillIDBCleanup-1" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx">     [webView loadRequest:request];
</span><span class="cx"> 
</span><del>-    RetainPtr<NSString> string1 = (NSString *)[getNextMessage() body];
-    RetainPtr<NSString> string2 = (NSString *)[getNextMessage() body];
-    RetainPtr<NSString> string3 = (NSString *)[getNextMessage() body];
-    RetainPtr<NSString> string4 = (NSString *)[getNextMessage() body];
</del><ins>+    auto string1 = getNextMessage();
+    auto string2 = getNextMessage();
+    auto string3 = getNextMessage();
+    auto string4 = getNextMessage();
</ins><span class="cx"> 
</span><span class="cx">     // Make a new web view with a new web process to finish the test
</span><span class="cx">     RetainPtr<WKWebView> webView2 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
</span><span class="lines">@@ -86,12 +86,12 @@
</span><span class="cx">     request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"WebProcessKillIDBCleanup-2" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx">     [webView2 loadRequest:request];
</span><span class="cx"> 
</span><del>-    RetainPtr<NSString> string5 = (NSString *)[getNextMessage() body];
</del><ins>+    auto string5 = getNextMessage();
</ins><span class="cx"> 
</span><span class="cx">     // Kill the first web process to unblock the second web processes transaction from starting.
</span><span class="cx">     [webView _killWebContentProcessAndResetState];
</span><span class="cx"> 
</span><del>-    RetainPtr<NSString> string6 = (NSString *)[getNextMessage() body];
</del><ins>+    auto string6 = getNextMessage();
</ins><span class="cx"> 
</span><span class="cx">     EXPECT_WK_STREQ(@"UpgradeNeeded", string1.get());
</span><span class="cx">     EXPECT_WK_STREQ(@"Transaction complete", string2.get());
</span><span class="lines">@@ -107,24 +107,29 @@
</span><span class="cx">     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><span class="cx">     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
</span><span class="cx"> 
</span><ins>+    __block bool readyToContinue = false;
+    [configuration.get().websiteDataStore removeDataOfTypes:[NSSet setWithObjects:WKWebsiteDataTypeIndexedDBDatabases, nil] modifiedSince:[NSDate distantPast] completionHandler:^() {
+        readyToContinue = true;
+    }];
+    TestWebKitAPI::Util::run(&readyToContinue);
+
</ins><span class="cx">     auto webView1 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
</span><span class="cx">     NSURLRequest *request1 = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"KillWebProcessWithOpenConnection-1" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx">     [webView1 loadRequest:request1];
</span><del>-    RetainPtr<NSString> string1 = (NSString *)[getNextMessage() body];
</del><ins>+    auto string1 = getNextMessage();
</ins><span class="cx">     EXPECT_WK_STREQ(@"Open Succeeded", string1.get());
</span><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">     NSURLRequest *request2 = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"KillWebProcessWithOpenConnection-2" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx">     [webView2 loadRequest:request2];
</span><del>-    RetainPtr<NSString> string2 = (NSString *)[getNextMessage() body];
-    EXPECT_WK_STREQ(@"First Open Succeeded", string2.get());
</del><ins>+    auto string2 = getNextMessage();
+    EXPECT_WK_STREQ(@"Version Change", string2.get());
</ins><span class="cx"> 
</span><ins>+    // Second database request in webView2 should not be processed.
</ins><span class="cx">     [webView2 _killWebContentProcessAndResetState];
</span><span class="cx">     [webView1 _killWebContentProcessAndResetState];
</span><span class="cx"> 
</span><del>-    TestWebKitAPI::Util::spinRunLoop(10);
-
</del><span class="cx">     [webView1 reload];
</span><del>-    RetainPtr<NSString> string3 = (NSString *)[getNextMessage() body];
</del><ins>+    auto string3 = getNextMessage();
</ins><span class="cx">     EXPECT_WK_STREQ(@"Open Succeeded", string3.get());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>