diff options
| author | Daniel Xie <dxie@google.com> | 2015-12-03 01:27:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-03 01:27:26 +0000 |
| commit | 0730bd1afdb33005daa26cd7b032c057cb9698f5 (patch) | |
| tree | 422e84ce70c6882898a2eeae1fcb166f8435e05d | |
| parent | 6de5831683acc64e2ca5efa61fae6834314d0eb2 (diff) | |
| parent | 79810ceebb071f7a52999783de2a3a529071bb93 (diff) | |
| download | libcore-0730bd1afdb33005daa26cd7b032c057cb9698f5.zip libcore-0730bd1afdb33005daa26cd7b032c057cb9698f5.tar.gz libcore-0730bd1afdb33005daa26cd7b032c057cb9698f5.tar.bz2 | |
Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into marshmallow-cts-dev
am: 79810ceebb
* commit '79810ceebb071f7a52999783de2a3a529071bb93':
Fix time calculation in test_SSLSession_getLastAccessedTime
| -rw-r--r-- | luni/src/test/java/libcore/javax/net/ssl/SSLSessionTest.java | 2 |
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() >= |