diff --git a/README.md b/README.md index 65b0f49823..eb25ef9f49 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-storage' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-storage:2.5.0' +implementation 'com.google.cloud:google-cloud-storage:2.5.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.5.0" +libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.5.1" ``` ## Authentication diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java index cacc0d5574..b713a22224 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java @@ -149,7 +149,13 @@ public static Collection testCases() throws IOException { .setMappings(new RpcMethodMappings()) .setProjectId("conformance-tests") .setHost(TEST_BENCH.getBaseUri().replaceAll("https?://", "")) - .setTestAllowFilter(RetryTestCaseResolver.includeAll()) + .setTestAllowFilter( + RetryTestCaseResolver.includeAll() + .and( + (m, trc) -> + trc.getScenarioId() + < 7) // Temporarily exclude resumable media scenarios + ) .build(); List retryTestCases = resolver.getRetryTestCases(); diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/TestRetryConformance.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/TestRetryConformance.java index 027da5377d..b9b8456ddf 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/TestRetryConformance.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/TestRetryConformance.java @@ -111,13 +111,21 @@ final class TestRetryConformance { .map(s -> s.replace("return-", "")) .collect(Collectors.joining("_")); this.bucketName = - String.format("%s_s%03d-%s-m%03d_bkt1", BASE_ID, scenarioId, instructionsString, mappingId); + String.format( + "%s_s%03d-%s-m%03d_bkt1", + BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId); this.bucketName2 = - String.format("%s_s%03d-%s-m%03d_bkt2", BASE_ID, scenarioId, instructionsString, mappingId); + String.format( + "%s_s%03d-%s-m%03d_bkt2", + BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId); this.userProject = - String.format("%s_s%03d-%s-m%03d_prj1", BASE_ID, scenarioId, instructionsString, mappingId); + String.format( + "%s_s%03d-%s-m%03d_prj1", + BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId); this.objectName = - String.format("%s_s%03d-%s-m%03d_obj1", BASE_ID, scenarioId, instructionsString, mappingId); + String.format( + "%s_s%03d-%s-m%03d_obj1", + BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId); } public String getProjectId() { diff --git a/pom.xml b/pom.xml index 56c6801e30..5867a9f1e3 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ com.google.cloud google-cloud-conformance-tests - 0.2.8 + 0.2.9 test