From da0652d19dd1c2b6d0b758ca466e6a590dbcbc9a Mon Sep 17 00:00:00 2001 From: Bo Zhang Date: Mon, 22 Feb 2021 10:32:57 +0800 Subject: [PATCH] Fix failed soak test After deprecating jcenter(), we need to add `expectDeprecationWarning()` to soak tests to avoid test failures. --- .../integtests/fixtures/executer/AbstractGradleExecuter.java | 2 +- .../MavenJcenterDependencyResolveIntegrationTest.groovy | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java index aed2112aae7e..916c66bbff8c 100644 --- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java +++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java @@ -1320,7 +1320,7 @@ private void validate(String output, String displayName) { i++; } else if (isDeprecationMessageInHelpDescription(line)) { i++; - } else if (expectedDeprecationWarnings.remove(line)) { + } else if (expectedDeprecationWarnings.removeIf(warning -> line.contains(warning))) { // Deprecation warning is expected i++; i = skipStackTrace(lines, i); diff --git a/subprojects/soak/src/integTest/groovy/org/gradle/connectivity/MavenJcenterDependencyResolveIntegrationTest.groovy b/subprojects/soak/src/integTest/groovy/org/gradle/connectivity/MavenJcenterDependencyResolveIntegrationTest.groovy index c24bb5b4ea58..542eba81a59c 100644 --- a/subprojects/soak/src/integTest/groovy/org/gradle/connectivity/MavenJcenterDependencyResolveIntegrationTest.groovy +++ b/subprojects/soak/src/integTest/groovy/org/gradle/connectivity/MavenJcenterDependencyResolveIntegrationTest.groovy @@ -23,6 +23,8 @@ import org.gradle.util.TestPrecondition class MavenJcenterDependencyResolveIntegrationTest extends AbstractIntegrationSpec { def "resolves a minimal dependency from bintray's jcenter"() { given: + executer.expectDeprecationWarning("The RepositoryHandler.jcenter() method has been deprecated.") + executer.expectDeprecationWarning("The RepositoryHandler.jcenter(Action) method has been deprecated.") buildFile << """ repositories { jcenter()