Change tests to set default with hyphen

palantir · Mar 24, 2023 · 35f2a59 · 35f2a59
1 parent 2dc3580
commit 35f2a59
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/...-jupiter/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyExtensionTest.java b/...-jupiter/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyExtensionTest.java
@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import com.palantir.docker.compose.DockerComposeExtension;
+import com.palantir.docker.compose.configuration.ProjectName;
 import com.palantir.docker.compose.connection.Container;
 import com.palantir.docker.compose.logging.LogDirectory;
 import java.io.IOException;
@@ -30,6 +31,7 @@
 class DockerProxyExtensionTest {
     @RegisterExtension
     static final DockerComposeExtension DOCKER_COMPOSE_EXTENSION = DockerComposeExtension.builder()
+            .projectName(ProjectName.fromString("dockerproxyextensiontest"))
             .file("src/integrationTest/resources/DockerProxyExtensionTest-services.yml")
             .saveLogsTo(LogDirectory.circleAwareLogDirectory(DockerProxyExtensionTest.class))
             .waitingForService("webserver", Container::areAllPortsOpen)

diff --git a/...r-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml b/...r-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml
@@ -1,7 +1,10 @@
-version: '2'
+version: '2.1'
 
 services:
   webserver:
     hostname: web
     domainname: server.here
     image: 1science/nginx
+networks:
+  default:
+    name: dockerproxyextensiontest-default
diff --git a/...y-rule-junit4/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyRuleTest.java b/...y-rule-junit4/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyRuleTest.java
@@ -16,6 +16,7 @@
 package com.palantir.docker.proxy;
 
 import com.palantir.docker.compose.DockerComposeRule;
+import com.palantir.docker.compose.configuration.ProjectName;
 import com.palantir.docker.compose.connection.Container;
 import com.palantir.docker.compose.logging.LogDirectory;
 import java.io.IOException;
@@ -27,6 +28,7 @@
 public class DockerProxyRuleTest {
     @ClassRule
     public static final DockerComposeRule DOCKER_COMPOSE_RULE = DockerComposeRule.builder()
+            .projectName(ProjectName.fromString("dockerproxyruletest"))
             .file("src/integrationTest/resources/DockerProxyRuleTest-services.yml")
             .saveLogsTo(LogDirectory.circleAwareLogDirectory(DockerProxyRuleTest.class))
             .waitingForService("webserver", Container::areAllPortsOpen)

diff --git a/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml b/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml
@@ -1,7 +1,10 @@
-version: '2'
+version: '2.1'
 
 services:
   webserver:
     hostname: web
     domainname: server.here
     image: 1science/nginx
+networks:
+  default:
+    name: dockerproxyruletest-default