Diff
Modified: trunk/LayoutTests/ChangeLog (202524 => 202525)
--- trunk/LayoutTests/ChangeLog 2016-06-28 00:33:28 UTC (rev 202524)
+++ trunk/LayoutTests/ChangeLog 2016-06-28 00:34:10 UTC (rev 202525)
@@ -1,3 +1,14 @@
+2016-06-27 Alex Christensen <[email protected]>
+
+ 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.
+
2016-06-27 Brian Burg <[email protected]>
Web Inspector: RuntimeManager should not use view object WebInspector.quickConsole
Deleted: trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt (202524 => 202525)
--- 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)
@@ -1,5 +0,0 @@
-ALERT: sending synchronous xhr
-ALERT: hello
-ALERT: sending synchronous xhr
-ALERT: hello
-
Deleted: trunk/LayoutTests/http/tests/xmlhttprequest/sync-delegate-callbacks.html (202524 => 202525)
--- 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)
@@ -1,19 +0,0 @@
-<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>
Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (202524 => 202525)
--- 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)
@@ -1836,9 +1836,6 @@
webkit.org/b/148709 fast/events/wheelevent-basic.html [ Skip ]
webkit.org/b/148709 fast/events/wheelevent-mousewheel-interaction.html [ Skip ]
-# 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 ]
-
# Flaky tests that need bugs
fast/dom/Window/post-message-crash.html [ Pass Failure ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (202524 => 202525)
--- 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)
@@ -703,9 +703,6 @@
# Always very slow, frequently timing out (only on bots, not locally).
webkit.org/b/121331 [ Yosemite ElCapitan ] http/tests/misc/submit-post-keygen.html [ Pass Failure Timeout ]
-# NSURLConnection doesn't allow us to clear the TLS session cache.
-[ Yosemite ElCapitan ] http/tests/xmlhttprequest/sync-delegate-callbacks.html [ Pass Failure ]
-
# <rdar://problem/26701829> com.apple.WebKit.WebContent.Development crashed in com.apple.security: Security::Mutex::unlock + 9
[ Sierra+ ] http/tests/misc/submit-post-keygen.html [ Pass Failure Timeout Crash ]
Deleted: trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/sync-delegate-callbacks-expected.txt (202524 => 202525)
--- 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)
@@ -1,6 +0,0 @@
-ALERT: sending synchronous xhr
-canAuthenticateAgainstProtectionSpace
-ALERT: hello
-ALERT: sending synchronous xhr
-ALERT: hello
-
Modified: trunk/Source/WebKit2/ChangeLog (202524 => 202525)
--- 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)
@@ -1,5 +1,15 @@
2016-06-27 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
Send canAuthenticateAgainstProtectionSpace calls from NetworkProcess directly to UIProcess
https://bugs.webkit.org/show_bug.cgi?id=159071
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (202524 => 202525)
--- 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)
@@ -415,11 +415,14 @@
void NetworkSession::clearCredentials()
{
+#if !USE(CREDENTIAL_STORAGE_WITH_NETWORK_SESSION)
ASSERT(m_dataTaskMapWithCredentials.isEmpty());
ASSERT(m_dataTaskMapWithoutCredentials.isEmpty());
ASSERT(m_downloadMap.isEmpty());
+ // FIXME: Use resetWithCompletionHandler instead.
m_sessionWithCredentialStorage = [NSURLSession sessionWithConfiguration:m_sessionWithCredentialStorage.get().configuration delegate:static_cast<id>(m_sessionWithCredentialStorageDelegate.get()) delegateQueue:[NSOperationQueue mainQueue]];
m_sessionWithoutCredentialStorage = [NSURLSession sessionWithConfiguration:m_sessionWithoutCredentialStorage.get().configuration delegate:static_cast<id>(m_sessionWithoutCredentialStorageDelegate.get()) delegateQueue:[NSOperationQueue mainQueue]];
+#endif
}
NetworkDataTask* NetworkSession::dataTaskForIdentifier(NetworkDataTask::TaskIdentifier taskIdentifier, WebCore::StoredCredentials storedCredentials)
