revert retry settings in context

Change-Id: I4e44b7ca859ba61424bfcd5607e857cb6bbf298c

Author: igorbernstein2

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java

@@ -709,11 +709,7 @@ public void testCallContextPropagatedInMutationBatcher()
       contextInterceptor.contexts.clear();
 
       // Override the timeout
-      GrpcCallContext clientCtx =
-          GrpcCallContext.createDefault()
-              .withTimeout(Duration.ofMinutes(10))
-              .withRetrySettings(
-                  RetrySettings.newBuilder().setTotalTimeout(Duration.ofMinutes(10)).build());
+      GrpcCallContext clientCtx = GrpcCallContext.createDefault().withTimeout(Duration.ofMinutes(10));
 
       // Send a batch
       try (Batcher<RowMutationEntry, Void> batcher =
@@ -742,11 +738,7 @@ public void testCallContextPropagatedInReadBatcher()
       contextInterceptor.contexts.clear();
 
       // Override the timeout
-      GrpcCallContext clientCtx =
-          GrpcCallContext.createDefault()
-              .withTimeout(Duration.ofMinutes(10))
-              .withRetrySettings(
-                  RetrySettings.newBuilder().setTotalTimeout(Duration.ofMinutes(10)).build());
+      GrpcCallContext clientCtx = GrpcCallContext.createDefault().withTimeout(Duration.ofMinutes(10));
 
       // Send a batch
       try (Batcher<ByteString, Row> batcher =
@@ -981,7 +973,7 @@ private static class ContextInterceptor implements ServerInterceptor {
     final BlockingQueue<MethodContext> contexts = Queues.newLinkedBlockingDeque();
 
     static class MethodContext {
-      final MethodDescriptor<?, ?> method;
+      final MethodDescriptor<?,?> method;
       final Context context;
 
       MethodContext(MethodDescriptor<?, ?> method, Context context) {