Skip to content

Commit 2ea6097

Browse files
renovate-botgcf-owl-bot[bot]BenWhitehead
authored
test(deps): update dependency com.google.cloud:google-cloud-conformance-tests to v0.2.9 (#1320)
* test(deps): update dependency com.google.cloud:google-cloud-conformance-tests to v0.2.9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: lower case instruction name to ensure valid bucket name generated * chore: update ITRetryConformanceTest resolution to temporarily exclude new resumable media scenarios Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: BenWhitehead <[email protected]>
1 parent 909d9c0 commit 2ea6097

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,13 @@ public static Collection<Object[]> testCases() throws IOException {
149149
.setMappings(new RpcMethodMappings())
150150
.setProjectId("conformance-tests")
151151
.setHost(TEST_BENCH.getBaseUri().replaceAll("https?://", ""))
152-
.setTestAllowFilter(RetryTestCaseResolver.includeAll())
152+
.setTestAllowFilter(
153+
RetryTestCaseResolver.includeAll()
154+
.and(
155+
(m, trc) ->
156+
trc.getScenarioId()
157+
< 7) // Temporarily exclude resumable media scenarios
158+
)
153159
.build();
154160

155161
List<RetryTestCase> retryTestCases = resolver.getRetryTestCases();

google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/TestRetryConformance.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,21 @@ final class TestRetryConformance {
111111
.map(s -> s.replace("return-", ""))
112112
.collect(Collectors.joining("_"));
113113
this.bucketName =
114-
String.format("%s_s%03d-%s-m%03d_bkt1", BASE_ID, scenarioId, instructionsString, mappingId);
114+
String.format(
115+
"%s_s%03d-%s-m%03d_bkt1",
116+
BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId);
115117
this.bucketName2 =
116-
String.format("%s_s%03d-%s-m%03d_bkt2", BASE_ID, scenarioId, instructionsString, mappingId);
118+
String.format(
119+
"%s_s%03d-%s-m%03d_bkt2",
120+
BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId);
117121
this.userProject =
118-
String.format("%s_s%03d-%s-m%03d_prj1", BASE_ID, scenarioId, instructionsString, mappingId);
122+
String.format(
123+
"%s_s%03d-%s-m%03d_prj1",
124+
BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId);
119125
this.objectName =
120-
String.format("%s_s%03d-%s-m%03d_obj1", BASE_ID, scenarioId, instructionsString, mappingId);
126+
String.format(
127+
"%s_s%03d-%s-m%03d_obj1",
128+
BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId);
121129
}
122130

123131
public String getProjectId() {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<dependency>
127127
<groupId>com.google.cloud</groupId>
128128
<artifactId>google-cloud-conformance-tests</artifactId>
129-
<version>0.2.8</version>
129+
<version>0.2.9</version>
130130
<scope>test</scope>
131131
<exclusions>
132132
<exclusion>

0 commit comments

Comments
 (0)