Deflake CallOptionsTest.withDeadlineNanoTime

ejona86 · ejona86 · commit 30d4f95a58cc · 2016-04-08T10:35:40.000-07:00
Two prong approach: increase the tolerance and decrease code between nanoTime() calls. Fixes grpc#1645
diff --git a/core/src/test/java/io/grpc/CallOptionsTest.java b/core/src/test/java/io/grpc/CallOptionsTest.java
@@ -152,13 +152,17 @@ public void toStringMatches_withDeadline() {
   @Test
   @SuppressWarnings("deprecation")
   public void withDeadlineNanoTime() {
-    CallOptions opts = CallOptions.DEFAULT.withDeadlineNanoTime(System.nanoTime());
+    // Create Deadline near calling System.nanoTime to reduce clock differences
+    Deadline reference = Deadline.after(-1, NANOSECONDS);
+    long rawDeadline = System.nanoTime() - 1;
+    CallOptions opts = CallOptions.DEFAULT.withDeadlineNanoTime(rawDeadline);
     assertThat(opts.getDeadlineNanoTime()).isNotNull();
+    // This is not technically correct, since nanoTime is permitted to overflow, but the chances of
+    // that impacting this test are very remote.
     assertThat(opts.getDeadlineNanoTime()).isAtMost(System.nanoTime());
     assertThat(opts.getDeadline().isExpired()).isTrue();
 
-    assertAbout(deadline()).that(opts.getDeadline())
-        .isWithin(20, MILLISECONDS).of(Deadline.after(0, SECONDS));
+    assertAbout(deadline()).that(opts.getDeadline()).isWithin(50, MILLISECONDS).of(reference);
   }
 
   // TODO(carl-mastrangelo): consider making a CallOptionsSubject for Truth.
