Changeset 267415 in webkit

Timestamp:

Sep 22, 2020, 9:40:21 AM (6 years ago)

Author:

Ryan Haddad

Message:

Cherry-pick r267278. rdar://problem/69374947

Make TLSVersion.NetworkSession API test more robust
​https://bugs.webkit.org/show_bug.cgi?id=216704
<rdar://problem/68643674>

Patch by Alex Christensen <​achristensen@webkit.org> on 2020-09-18
Reviewed by Tim Horton.

r265573 made preconnect attempts to legacy TLS servers fail.
This caused the TLSVersion.NetworkSession to assert because the first connection attempt would fail
(and the second would succeed if it was supposed to succeed with the conditions in the test).
The test calls waitForDidFailProvisionalNavigation in cases where it is supposed to fail and
waitForDidFinishNavigation in cases where it supposed to succeed.
Like I did in r266100 with another test, use HTTPServer which allows a variable number of connection attempts.

• TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm: (TestWebKitAPI::TEST):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@267278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm (modified) (6 diffs)

branches/safari-610-branch/Tools/ChangeLog

@@ +1 @@
+2020-09-22  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Cherry-pick r267278. rdar://problem/69374947
+
+    Make TLSVersion.NetworkSession API test more robust
+    https://bugs.webkit.org/show_bug.cgi?id=216704
+    <rdar://problem/68643674>
+    
+    Patch by Alex Christensen <achristensen@webkit.org> on 2020-09-18
+    Reviewed by Tim Horton.
+    
+    r265573 made preconnect attempts to legacy TLS servers fail.
+    This caused the TLSVersion.NetworkSession to assert because the first connection attempt would fail
+    (and the second would succeed if it was supposed to succeed with the conditions in the test).
+    The test calls waitForDidFailProvisionalNavigation in cases where it is supposed to fail and
+    waitForDidFinishNavigation in cases where it supposed to succeed.
+    Like I did in r266100 with another test, use HTTPServer which allows a variable number of connection attempts.
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
+    (TestWebKitAPI::TEST):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267278 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-09-18  Alex Christensen  <achristensen@webkit.org>
+
+            Make TLSVersion.NetworkSession API test more robust
+            https://bugs.webkit.org/show_bug.cgi?id=216704
+            <rdar://problem/68643674>
+
+            Reviewed by Tim Horton.
+
+            r265573 made preconnect attempts to legacy TLS servers fail.
+            This caused the TLSVersion.NetworkSession to assert because the first connection attempt would fail
+            (and the second would succeed if it was supposed to succeed with the conditions in the test).
+            The test calls waitForDidFailProvisionalNavigation in cases where it is supposed to fail and
+            waitForDidFinishNavigation in cases where it supposed to succeed.
+            Like I did in r266100 with another test, use HTTPServer which allows a variable number of connection attempts.
+
+            * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
+            (TestWebKitAPI::TEST):
+
 2020-09-17  Alan Coon  <alancoon@apple.com>
 

branches/safari-610-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm

@@ -167 +167 @@
 TEST(TLSVersion, NetworkSession)
 {
+    HTTPServer server(HTTPServer::respondWithOK, HTTPServer::Protocol::HttpsWithLegacyTLS);
     static auto delegate = adoptNS([TestNavigationDelegate new]);
     auto makeWebViewWith = [&] (WKWebsiteDataStore *store) {
@@ -180 +181 @@
     };
     {
-        TCPServer server(TCPServer::Protocol::HTTPS, TCPServer::respondWithOK, tls1_1);
         auto webView = makeWebViewWith([WKWebsiteDataStore defaultDataStore]);
         [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://127.0.0.1:%d/", server.port()]]]];
@@ -186 +186 @@
     }
     {
-        TCPServer server(TCPServer::Protocol::HTTPS, TCPServer::respondWithOK, tls1_1);
         auto webView = makeWebViewWith([WKWebsiteDataStore nonPersistentDataStore]);
         [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://127.0.0.1:%d/", server.port()]]]];
@@ -192 +191 @@
     }
     {
-        TCPServer server(TCPServer::Protocol::HTTPS, [](SSL *ssl) {
-            EXPECT_FALSE(ssl);
-        }, tls1_1);
         auto configuration = adoptNS([[_WKWebsiteDataStoreConfiguration alloc] initNonPersistentConfiguration]);
         [configuration setLegacyTLSEnabled:NO];
@@ -204 +200 @@
     [[NSUserDefaults standardUserDefaults] setBool:NO forKey:defaultsKey];
     {
-        TCPServer server(TCPServer::Protocol::HTTPS, [](SSL *ssl) {
-            EXPECT_FALSE(ssl);
-        }, tls1_1);
         auto webView = makeWebViewWith([WKWebsiteDataStore defaultDataStore]);
         [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://127.0.0.1:%d/", server.port()]]]];
@@ -212 +205 @@
     }
     {
-        TCPServer server(TCPServer::Protocol::HTTPS, [](SSL *ssl) {
-            EXPECT_FALSE(ssl);
-        }, tls1_1);
         auto webView = makeWebViewWith([WKWebsiteDataStore nonPersistentDataStore]);
         [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://127.0.0.1:%d/", server.port()]]]];