summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-12-03 01:15:53 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-12-03 01:15:53 +0000
commit79810ceebb071f7a52999783de2a3a529071bb93 (patch)
tree0c994f8e5403e8dc7777debf97d130a151d01036
parentb75ac5656e423b03e009f809d81dd04de2de6664 (diff)
parent36363b0d43f12432837ab936b85973f08e74a299 (diff)
downloadlibcore-79810ceebb071f7a52999783de2a3a529071bb93.zip
libcore-79810ceebb071f7a52999783de2a3a529071bb93.tar.gz
libcore-79810ceebb071f7a52999783de2a3a529071bb93.tar.bz2
Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into marshmallow-cts-dev
-rw-r--r--luni/src/test/java/libcore/javax/net/ssl/SSLSessionTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/luni/src/test/java/libcore/javax/net/ssl/SSLSessionTest.java b/luni/src/test/java/libcore/javax/net/ssl/SSLSessionTest.java
index a434d94..bc2b626 100644
--- a/luni/src/test/java/libcore/javax/net/ssl/SSLSessionTest.java
+++ b/luni/src/test/java/libcore/javax/net/ssl/SSLSessionTest.java
@@ -99,7 +99,7 @@ public class SSLSessionTest extends TestCase {
assertTrue("s.server.getLastAccessedTime()=" + s.server.getLastAccessedTime() + " " +
"s.client.getLastAccessedTime()=" + s.client.getLastAccessedTime(),
Math.abs(s.server.getLastAccessedTime()
- - s.client.getLastAccessedTime()) < 1 * 1000);
+ - s.client.getLastAccessedTime()) <= 1 * 1000);
assertTrue(s.server.getLastAccessedTime() >=
s.server.getCreationTime());
assertTrue(s.client.getLastAccessedTime() >=