diff options
| author | Daniel Xie <dxie@google.com> | 2015-12-03 01:30:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-03 01:30:48 +0000 |
| commit | dbb8202b051b096040ef12d794cf1f580dd0974a (patch) | |
| tree | 422e84ce70c6882898a2eeae1fcb166f8435e05d | |
| parent | d750708ff7c5e924e4ec99f42037a42fe4c92a69 (diff) | |
| parent | 0730bd1afdb33005daa26cd7b032c057cb9698f5 (diff) | |
| download | libcore-dbb8202b051b096040ef12d794cf1f580dd0974a.zip libcore-dbb8202b051b096040ef12d794cf1f580dd0974a.tar.gz libcore-dbb8202b051b096040ef12d794cf1f580dd0974a.tar.bz2 | |
Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into marshmallow-cts-dev am: 79810ceebb
am: 0730bd1afd
* commit '0730bd1afdb33005daa26cd7b032c057cb9698f5':
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() >= |