summaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2014-11-21 14:42:37 -0800
committerAlex Klyubin <klyubin@google.com>2014-11-24 08:40:30 -0800
commit4e1404f2017dc7db05b69ecad241f78c5bb1a4ee (patch)
treed0f3a1aae45ad141d54a560f71156c3cb6bef349 /support
parent3af56629930e754e8b80c6964da1d9de83510b9e (diff)
downloadlibcore-4e1404f2017dc7db05b69ecad241f78c5bb1a4ee.zip
libcore-4e1404f2017dc7db05b69ecad241f78c5bb1a4ee.tar.gz
libcore-4e1404f2017dc7db05b69ecad241f78c5bb1a4ee.tar.bz2
Assert finite default timeout for TLS/SSL sessions.
This makes CTS tests expect 8 hours as the default timeout for TLS/SSL sessions. Prior to this change, sessions were expected to not time out by default. Bug: 18370076 Change-Id: I09ae9ee91df2fb4bb2e8cc812127dc9f05a14696
Diffstat (limited to 'support')
-rw-r--r--support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java b/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java
index 8dd2085..8173e9d 100644
--- a/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java
+++ b/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java
@@ -53,7 +53,8 @@ public final class TestSSLContext extends Assert {
private static final boolean IS_RI = StandardNames.IS_RI;
public static final int EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE = (IS_RI) ? 0 : 10;
public static final int EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE = (IS_RI) ? 0 : 100;
- public static final int EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT = (IS_RI) ? 86400 : 0;
+ public static final int EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT =
+ (IS_RI) ? 24 * 3600 : 8 * 3600;
/**
* The Android SSLSocket and SSLServerSocket implementations are