---

shollyman · sduskis · commit aa85ae955f24 · 2019-05-24T08:43:50.000-04:00
yaml --- r: 35355 b: refs/heads/pubsub-ordering-keys c: 5f045ef h: refs/heads/master i: 35353: 8d41142 35351: 1d3c42c
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 7f07a1adf7c6adaed14791fa1f059bdc7284571a
+refs/heads/pubsub-ordering-keys: 5f045ef212c60e819c6d5ba374b838036a19441b
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettingsTest.java b/branches/pubsub-ordering-keys/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/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/stub/readrows/ReadRowsRetryTest.java b/branches/pubsub-ordering-keys/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)
