fix(retrofit2): fix the integration test failure by changing the prof…

…ile name of all the test classes that use Retrofit2TestConfig. Error Details: Parameter 1 of constructor in com.netflix.spinnaker.config.OkHttpClientComponents required a single bean, but 2 were found: - okHttpClientConfigurationProperties: defined by method 'okHttpClientConfigurationProperties' in class path resource [com/netflix/spinnaker/echo/config/Retrofit2TestConfig.class] - ok-http-client-com.netflix.spinnaker.okhttp.OkHttpClientConfigurationProperties: defined in unknown location
spinnaker · Dec 30, 2024 · ee81fce · ee81fce
1 parent 4b1b77b
commit ee81fce
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/config/GithubConfigSpec.groovy b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/config/GithubConfigSpec.groovy
@@ -11,7 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
-@ActiveProfiles("test")
+@ActiveProfiles("testing")
 @SpringBootTest(
   classes = [Retrofit2TestConfig, Retrofit2BasicLogTestConfig],
   properties = ["github-status.enabled=true"],
@@ -74,7 +74,7 @@ class GithubConfigLogLevelBasicSpec extends Specification {
   }
 }
 
-@ActiveProfiles("test")
+@ActiveProfiles("testing")
 @SpringBootTest(
   classes = [Retrofit2TestConfig, Retrofit2NoneLogTestConfig],
   properties = ["github-status.enabled=true"],
@@ -121,7 +121,7 @@ class GithubConfigLogLevelNoneSpec extends Specification {
   }
 }
 
-@ActiveProfiles("test")
+@ActiveProfiles("testing")
 @SpringBootTest(
   classes = [Retrofit2TestConfig, Retrofit2HeadersLogTestConfig],
   properties = ["github-status.enabled=true"],

diff --git a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/config/SlackConfigSpec.groovy b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/config/SlackConfigSpec.groovy
@@ -9,7 +9,7 @@ import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 import spock.lang.Subject
 
-@ActiveProfiles("test")
+@ActiveProfiles("testing")
 @SpringBootTest(
   classes = [SlackConfig, Retrofit2TestConfig, Retrofit2BasicLogTestConfig],
   properties = [

diff --git a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/slack/SlackServiceSpec.groovy b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/slack/SlackServiceSpec.groovy
@@ -32,7 +32,7 @@ import spock.util.concurrent.BlockingVariable
 
 import static java.util.Collections.emptyList
 
-@ActiveProfiles("test")
+@ActiveProfiles("testing")
 @SpringBootTest(classes = [Retrofit2TestConfig, Retrofit2BasicLogTestConfig],
   properties = ["slack.enabled=true"],
   webEnvironment = SpringBootTest.WebEnvironment.NONE)

diff --git a/echo-rest/src/test/groovy/com/netflix/spinnaker/echo/config/RestConfigSpec.groovy b/echo-rest/src/test/groovy/com/netflix/spinnaker/echo/config/RestConfigSpec.groovy
@@ -18,7 +18,7 @@ import spock.lang.Specification
 import spock.lang.Subject
 import spock.util.concurrent.BlockingVariable
 
-@ActiveProfiles("test")
+@ActiveProfiles("testing")
 @SpringBootTest(classes = [Retrofit2TestConfig, Retrofit2BasicLogTestConfig],
   webEnvironment = SpringBootTest.WebEnvironment.NONE)
 class RestConfigSpec extends Specification {

diff --git a/echo-test/src/main/groovy/com/netflix/spinnaker/echo/config/Retrofit2TestConfig.groovy b/echo-test/src/main/groovy/com/netflix/spinnaker/echo/config/Retrofit2TestConfig.groovy
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Profile
 
 @Configuration
-@Profile("test")
+@Profile("testing")
 class Retrofit2TestConfig {
   @Autowired
   ObjectFactory<OkHttpClient.Builder> httpClientBuilderFactory