Merge remote-tracking branch 'origin/master' into opencensus-2-lro-co…

…ntext
igorbernstein2 · Oct 10, 2018 · 70cb018 · 70cb018
2 parents e9bbb95 + b842b23
commit 70cb018
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/gax/src/test/java/com/google/api/gax/rpc/AttemptCallableTest.java b/gax/src/test/java/com/google/api/gax/rpc/AttemptCallableTest.java
@@ -101,4 +101,18 @@ public void testRpcTimeout() {
     callable.call();
     assertThat(capturedCallContext.getValue().getTimeout()).isEqualTo(longerTimeout);
   }
+
+  @Test
+  public void testRpcTimeoutIsNotErased() {
+    Duration callerTimeout = Duration.ofMillis(10);
+    ApiCallContext callerCallContext = FakeCallContext.createDefault().withTimeout(callerTimeout);
+
+    AttemptCallable<String, String> callable =
+        new AttemptCallable<>(mockInnerCallable, "fake-request", callerCallContext);
+    callable.setExternalFuture(mockExternalFuture);
+
+    callable.call();
+
+    assertThat(capturedCallContext.getValue().getTimeout()).isEqualTo(callerTimeout);
+  }
 }