<!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>[202525] trunk</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/202525">202525</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-06-27 17:34:10 -0700 (Mon, 27 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix flakiness on Sierra after <a href="http://trac.webkit.org/projects/webkit/changeset/202511">r202511</a>
https://bugs.webkit.org/show_bug.cgi?id=159071
Source/WebKit2:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSession::clearCredentials):
Replacing the NSURLSessions immediately caused assertions because the tasks are not always all stopped immediately when tearing down a test.
Stopping an NSURLSession needs to be done asynchronously. I'll try a different testing technique for <a href="http://trac.webkit.org/projects/webkit/changeset/202511">r202511</a>.
LayoutTests:
* http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt: Removed.
* http/tests/xmlhttprequest/sync-delegate-callbacks.html: Removed.
* platform/ios-simulator-wk2/TestExpectations:
* platform/mac/TestExpectations:
* platform/wk2/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestsyncdelegatecallbacksexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestsyncdelegatecallbackshtml">trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks.html</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsxmlhttprequestsyncdelegatecallbacksexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202524 => 202525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-28 00:33:28 UTC (rev 202524)
+++ trunk/LayoutTests/ChangeLog 2016-06-28 00:34:10 UTC (rev 202525)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-27 Alex Christensen <achristensen@webkit.org>
+
+ Fix flakiness on Sierra after r202511
+ https://bugs.webkit.org/show_bug.cgi?id=159071
+
+ * http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt: Removed.
+ * http/tests/xmlhttprequest/sync-delegate-callbacks.html: Removed.
+ * platform/ios-simulator-wk2/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/wk2/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt: Removed.
+
</ins><span class="cx"> 2016-06-27 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: RuntimeManager should not use view object WebInspector.quickConsole
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestsyncdelegatecallbacksexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt (202524 => 202525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt 2016-06-28 00:33:28 UTC (rev 202524)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt 2016-06-28 00:34:10 UTC (rev 202525)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-ALERT: sending synchronous xhr
-ALERT: hello
-ALERT: sending synchronous xhr
-ALERT: hello
-
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestsyncdelegatecallbackshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks.html (202524 => 202525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks.html 2016-06-28 00:33:28 UTC (rev 202524)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks.html 2016-06-28 00:34:10 UTC (rev 202525)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- // FIXME: http://webkit.org/b/65196
- if (testRunner.setShouldLogCanAuthenticateAgainstProtectionSpace)
- testRunner.setShouldLogCanAuthenticateAgainstProtectionSpace(true);
-}
-for (var i = 0; i < 2; i++) {
- alert("sending synchronous xhr");
- try {
- var req = new XMLHttpRequest();
- req.open("GET", "https://127.0.0.1:8443/xmlhttprequest/resources/allow-any-origin.php", false);
- req.send(null);
- } catch (ex) {
- alert(ex);
- }
- alert(req.responseText);
-}
-</script>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (202524 => 202525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-06-28 00:33:28 UTC (rev 202524)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-06-28 00:34:10 UTC (rev 202525)
</span><span class="lines">@@ -1836,9 +1836,6 @@
</span><span class="cx"> webkit.org/b/148709 fast/events/wheelevent-basic.html [ Skip ]
</span><span class="cx"> webkit.org/b/148709 fast/events/wheelevent-mousewheel-interaction.html [ Skip ]
</span><span class="cx">
</span><del>-# NSURLConnection doesn't allow us to clear the TLS session cache. This is flaky on iOS9.
-http/tests/xmlhttprequest/sync-delegate-callbacks.html [ Pass Failure ]
-
</del><span class="cx"> # Flaky tests that need bugs
</span><span class="cx"> fast/dom/Window/post-message-crash.html [ Pass Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (202524 => 202525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-06-28 00:33:28 UTC (rev 202524)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-06-28 00:34:10 UTC (rev 202525)
</span><span class="lines">@@ -703,9 +703,6 @@
</span><span class="cx"> # Always very slow, frequently timing out (only on bots, not locally).
</span><span class="cx"> webkit.org/b/121331 [ Yosemite ElCapitan ] http/tests/misc/submit-post-keygen.html [ Pass Failure Timeout ]
</span><span class="cx">
</span><del>-# NSURLConnection doesn't allow us to clear the TLS session cache.
-[ Yosemite ElCapitan ] http/tests/xmlhttprequest/sync-delegate-callbacks.html [ Pass Failure ]
-
</del><span class="cx"> # <rdar://problem/26701829> com.apple.WebKit.WebContent.Development crashed in com.apple.security: Security::Mutex::unlock + 9
</span><span class="cx"> [ Sierra+ ] http/tests/misc/submit-post-keygen.html [ Pass Failure Timeout Crash ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsxmlhttprequestsyncdelegatecallbacksexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt (202524 => 202525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt 2016-06-28 00:33:28 UTC (rev 202524)
+++ trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt 2016-06-28 00:34:10 UTC (rev 202525)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-ALERT: sending synchronous xhr
-canAuthenticateAgainstProtectionSpace
-ALERT: hello
-ALERT: sending synchronous xhr
-ALERT: hello
-
</del></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202524 => 202525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-28 00:33:28 UTC (rev 202524)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-28 00:34:10 UTC (rev 202525)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-06-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Fix flakiness on Sierra after r202511
+ https://bugs.webkit.org/show_bug.cgi?id=159071
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSession::clearCredentials):
+ Replacing the NSURLSessions immediately caused assertions because the tasks are not always all stopped immediately when tearing down a test.
+ Stopping an NSURLSession needs to be done asynchronously. I'll try a different testing technique for r202511.
+
+2016-06-27 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Send canAuthenticateAgainstProtectionSpace calls from NetworkProcess directly to UIProcess
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159071
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (202524 => 202525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-06-28 00:33:28 UTC (rev 202524)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-06-28 00:34:10 UTC (rev 202525)
</span><span class="lines">@@ -415,11 +415,14 @@
</span><span class="cx">
</span><span class="cx"> void NetworkSession::clearCredentials()
</span><span class="cx"> {
</span><ins>+#if !USE(CREDENTIAL_STORAGE_WITH_NETWORK_SESSION)
</ins><span class="cx"> ASSERT(m_dataTaskMapWithCredentials.isEmpty());
</span><span class="cx"> ASSERT(m_dataTaskMapWithoutCredentials.isEmpty());
</span><span class="cx"> ASSERT(m_downloadMap.isEmpty());
</span><ins>+ // FIXME: Use resetWithCompletionHandler instead.
</ins><span class="cx"> m_sessionWithCredentialStorage = [NSURLSession sessionWithConfiguration:m_sessionWithCredentialStorage.get().configuration delegate:static_cast<id>(m_sessionWithCredentialStorageDelegate.get()) delegateQueue:[NSOperationQueue mainQueue]];
</span><span class="cx"> m_sessionWithoutCredentialStorage = [NSURLSession sessionWithConfiguration:m_sessionWithoutCredentialStorage.get().configuration delegate:static_cast<id>(m_sessionWithoutCredentialStorageDelegate.get()) delegateQueue:[NSOperationQueue mainQueue]];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkDataTask* NetworkSession::dataTaskForIdentifier(NetworkDataTask::TaskIdentifier taskIdentifier, WebCore::StoredCredentials storedCredentials)
</span></span></pre>
</div>
</div>
</body>
</html>