diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-12-19 11:10:26 -0800 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2013-12-19 11:10:26 -0800 |
| commit | 9de94e4aaa6de951d1c7ca08d137d57b36d24fa3 (patch) | |
| tree | e4fbf3985d4caa26c051305d87b0902ea3294fd0 /luni/src | |
| parent | 3b94868dd195da3c54e0d421927e13ee87dc82be (diff) | |
| download | libcore-9de94e4aaa6de951d1c7ca08d137d57b36d24fa3.zip libcore-9de94e4aaa6de951d1c7ca08d137d57b36d24fa3.tar.gz libcore-9de94e4aaa6de951d1c7ca08d137d57b36d24fa3.tar.bz2 | |
Fix test breakages due to TLSv1.2 enabled and FS preferred.
Bug: 11220570
Change-Id: Ic918e806ae1d8ea9b98c690cfabd9c3245886525
Diffstat (limited to 'luni/src')
| -rw-r--r-- | luni/src/test/java/libcore/java/net/URLConnectionTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/luni/src/test/java/libcore/java/net/URLConnectionTest.java b/luni/src/test/java/libcore/java/net/URLConnectionTest.java index 7ecdc59..fc93ee6 100644 --- a/luni/src/test/java/libcore/java/net/URLConnectionTest.java +++ b/luni/src/test/java/libcore/java/net/URLConnectionTest.java @@ -472,7 +472,7 @@ public final class URLConnectionTest extends TestCase { RecordedRequest request = server.takeRequest(); assertEquals("GET /foo HTTP/1.1", request.getRequestLine()); - assertEquals("TLSv1", request.getSslProtocol()); + assertEquals("TLSv1.2", request.getSslProtocol()); } public void testConnectViaHttpsReusingConnections() throws IOException, InterruptedException { @@ -1676,7 +1676,7 @@ public final class URLConnectionTest extends TestCase { + "CN=" + hostName + " 1, " + "CN=Test Intermediate Certificate Authority 1, " + "CN=Test Root Certificate Authority 1" - + "] RSA"), + + "] ECDHE_RSA"), trustManager.calls); } finally { HttpsURLConnection.setDefaultHostnameVerifier(defaultHostnameVerifier); |