From 6eddded9104c84064cca97ac1360b7ded9f58b5e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 20 Jul 2023 17:12:12 +0000 Subject: [PATCH 1/2] deps: update gcr.io/cloud-devrel-public-resources/storage-testbench docker tag to v0.37.0 --- .../com/google/cloud/storage/it/runner/registry/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-storage/src/test/resources/com/google/cloud/storage/it/runner/registry/Dockerfile b/google-cloud-storage/src/test/resources/com/google/cloud/storage/it/runner/registry/Dockerfile index 35df4e1df..0b793bc30 100644 --- a/google-cloud-storage/src/test/resources/com/google/cloud/storage/it/runner/registry/Dockerfile +++ b/google-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 From 1ba9f050b7b5978872ad831b23344465fe086e0d Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Thu, 20 Jul 2023 13:25:06 -0400 Subject: [PATCH 2/2] test: re-enable tests Fixes #2114 --- .../conformance/retry/RpcMethodMappings.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/RpcMethodMappings.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/RpcMethodMappings.java index 7a87f3304..cc14b21e3 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/RpcMethodMappings.java +++ b/google-cloud-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 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 funcMap; RpcMethodMappings() { @@ -1534,10 +1528,7 @@ private static void insert(ArrayList 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 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(