bigquerystorage: excise retry expectations in tests for DEADLINE_EXCEEDED (#5219)

shollyman · sduskis · commit 5f045ef212c6 · 2019-05-24T08:43:50.000-04:00
* BigQuery Storage: modify test expectations for retrying on DEADLINE_EXCEEDED.

* excise additional DEADLINE_EXCEEDED expectations
diff --git a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettingsTest.java b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettingsTest.java
@@ -120,7 +120,7 @@ public void testCreateReadSessionSettings() {
   public void testReadRowsSettings() {
     ServerStreamingCallSettings.Builder<ReadRowsRequest, ReadRowsResponse> builder =
         EnhancedBigQueryStorageStubSettings.newBuilder().readRowsSettings();
-    assertThat(builder.getRetryableCodes()).containsAllOf(Code.DEADLINE_EXCEEDED, Code.UNAVAILABLE);
+    assertThat(builder.getRetryableCodes()).contains(Code.UNAVAILABLE);
     RetrySettings retrySettings = builder.getRetrySettings();
     assertThat(retrySettings.getInitialRetryDelay()).isEqualTo(Duration.ofMillis(100L));
     assertThat(retrySettings.getRetryDelayMultiplier()).isWithin(1e-6).of(1.3);
@@ -157,7 +157,7 @@ public void testSplitReadStreamSettings() {
   }
 
   private void verifyRetrySettings(Set<Code> retryCodes, RetrySettings retrySettings) {
-    assertThat(retryCodes).containsAllOf(Code.DEADLINE_EXCEEDED, Code.UNAVAILABLE);
+    assertThat(retryCodes).contains(Code.UNAVAILABLE);
     assertThat(retrySettings.getTotalTimeout()).isGreaterThan(Duration.ZERO);
     assertThat(retrySettings.getInitialRetryDelay()).isGreaterThan(Duration.ZERO);
     assertThat(retrySettings.getRetryDelayMultiplier()).isAtLeast(1.0);
diff --git a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/readrows/ReadRowsRetryTest.java b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/readrows/ReadRowsRetryTest.java
@@ -112,11 +112,6 @@ public void multipleRetryTestWithZeroInitialOffset() {
             .respondWithNumberOfRows(5)
             .respondWithStatus(Code.UNAVAILABLE));
 
-    service.expectations.add(
-        RpcExpectation.create()
-            .expectRequest("fake-stream", 5)
-            .respondWithStatus(Code.DEADLINE_EXCEEDED));
-
     service.expectations.add(
         RpcExpectation.create()
             .expectRequest("fake-stream", 5)
@@ -139,11 +134,6 @@ public void multipleRetryTestWithNonZeroInitialOffset() {
             .respondWithNumberOfRows(5)
             .respondWithStatus(Code.UNAVAILABLE));
 
-    service.expectations.add(
-        RpcExpectation.create()
-            .expectRequest("fake-stream", 22)
-            .respondWithStatus(Code.DEADLINE_EXCEEDED));
-
     service.expectations.add(
         RpcExpectation.create()
             .expectRequest("fake-stream", 22)
