deps(test): update gcr.io/cloud-devrel-public-resources/storage-testb…

…ench docker tag to v0.37.0 (#2130) * test: re-enable tests Fixes #2114 --------- Co-authored-by: BenWhitehead <[email protected]>
googleapis · Jul 20, 2023 · 9e8b6d3 · 9e8b6d3
1 parent e16595e
commit 9e8b6d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/...d-storage/src/test/java/com/google/cloud/storage/conformance/retry/RpcMethodMappings.java b/...d-storage/src/test/java/com/google/cloud/storage/conformance/retry/RpcMethodMappings.java
@@ -20,7 +20,6 @@
 import static com.google.cloud.storage.conformance.retry.CtxFunctions.ResourceSetup.notificationSetup;
 import static com.google.cloud.storage.conformance.retry.CtxFunctions.ResourceSetup.pubsubTopicSetup;
 import static com.google.cloud.storage.conformance.retry.CtxFunctions.ResourceSetup.serviceAccount;
-import static com.google.cloud.storage.conformance.retry.ITRetryConformanceTest.RetryTestCaseResolver.instructionsAre;
 import static com.google.common.base.Predicates.and;
 import static com.google.common.base.Predicates.not;
 import static com.google.common.truth.Truth.assertThat;
@@ -127,11 +126,6 @@ final class RpcMethodMappings {
 
   static final int _2MiB = 2 * 1024 * 1024;
   private static final ImmutableMap<String, String> MODIFY = ImmutableMap.of("a", "b");
-  private static final CtxFunction skipUntil2114Fixed =
-      temporarilySkipMapping(
-          "Skipped until https://github.com/googleapis/java-storage/issues/2114 is fixed",
-          instructionsAre("return-503-after-8192K", "return-408")
-              .or(instructionsAre("return-503-after-256K")));
   final Multimap<RpcMethod, RpcMethodMapping> funcMap;
 
   RpcMethodMappings() {
@@ -1534,10 +1528,7 @@ private static void insert(ArrayList<RpcMethodMapping> a) {
         a.add(
             RpcMethodMapping.newBuilder(50, objects.insert)
                 .withApplicable(TestRetryConformance::isPreconditionsProvided)
-                .withSetup(
-                    defaultSetup
-                        .andThen(Local.blobInfoWithGenerationZero)
-                        .compose(skipUntil2114Fixed))
+                .withSetup(defaultSetup.andThen(Local.blobInfoWithGenerationZero))
                 .withTest(
                     (ctx, c) ->
                         ctx.map(
@@ -1552,10 +1543,7 @@ private static void insert(ArrayList<RpcMethodMapping> a) {
         a.add(
             RpcMethodMapping.newBuilder(51, objects.insert)
                 .withApplicable(TestRetryConformance::isPreconditionsProvided)
-                .withSetup(
-                    defaultSetup
-                        .andThen(Local.blobInfoWithGenerationZero)
-                        .compose(skipUntil2114Fixed))
+                .withSetup(defaultSetup.andThen(Local.blobInfoWithGenerationZero))
                 .withTest(
                     (ctx, c) ->
                         ctx.map(

diff --git a/...e-cloud-storage/src/test/resources/com/google/cloud/storage/it/runner/registry/Dockerfile b/...e-cloud-storage/src/test/resources/com/google/cloud/storage/it/runner/registry/Dockerfile
@@ -1 +1 @@
-FROM gcr.io/cloud-devrel-public-resources/storage-testbench:v0.36.0
+FROM gcr.io/cloud-devrel-public-resources/storage-testbench:v0.37.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM gcr.io/cloud-devrel-public-resources/storage-testbench:v0.36.0
		FROM gcr.io/cloud-devrel-public-resources/storage-testbench:v0.37.0