Skip to content

Commit 47304c5

Browse files
committed
disable tests
1 parent fdd303e commit 47304c5

File tree

6 files changed

+12
-28
lines changed

6 files changed

+12
-28
lines changed

core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package org.testcontainers.junit;
22

33
import org.junit.jupiter.api.AutoClose;
4+
import org.junit.jupiter.api.Disabled;
45
import org.testcontainers.containers.DockerComposeContainer;
5-
import org.testcontainers.utility.CommandLine;
66
import org.testcontainers.utility.DockerImageName;
77

88
import java.io.File;
99

10-
import static org.assertj.core.api.Assumptions.assumeThat;
11-
10+
@Disabled
1211
class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {
1312

1413
@AutoClose
@@ -20,8 +19,6 @@ class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {
2019
.withEnv("REDIS_PORT", String.valueOf(REDIS_PORT));
2120

2221
DockerComposeContainerPortViaEnvTest() {
23-
assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
24-
.doesNotStartWith("Docker Compose version v2");
2522
environment.start();
2623
}
2724

core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.testcontainers.junit;
22

33
import org.junit.jupiter.api.AutoClose;
4+
import org.junit.jupiter.api.Disabled;
45
import org.junit.jupiter.api.Test;
56
import org.testcontainers.containers.ContainerState;
67
import org.testcontainers.containers.DockerComposeContainer;
7-
import org.testcontainers.utility.CommandLine;
88
import org.testcontainers.utility.DockerImageName;
99

1010
import java.io.File;
@@ -15,11 +15,11 @@
1515
import java.util.Optional;
1616

1717
import static org.assertj.core.api.Assertions.assertThat;
18-
import static org.assertj.core.api.Assumptions.assumeThat;
1918

2019
/**
2120
* Created by rnorth on 08/08/2015.
2221
*/
22+
@Disabled
2323
class DockerComposeContainerTest extends BaseDockerComposeTest {
2424

2525
@AutoClose
@@ -31,8 +31,6 @@ class DockerComposeContainerTest extends BaseDockerComposeTest {
3131
.withExposedService("db_1", 3306);
3232

3333
DockerComposeContainerTest() {
34-
assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
35-
.doesNotStartWith("Docker Compose version v2");
3634
environment.start();
3735
}
3836

core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package org.testcontainers.junit;
22

33
import org.junit.jupiter.api.AutoClose;
4+
import org.junit.jupiter.api.Disabled;
45
import org.junit.jupiter.api.Test;
56
import org.testcontainers.containers.DockerComposeContainer;
6-
import org.testcontainers.utility.CommandLine;
77
import org.testcontainers.utility.DockerImageName;
88

99
import java.io.File;
1010

1111
import static org.assertj.core.api.Assertions.assertThat;
1212
import static org.assertj.core.api.Assertions.assertThatThrownBy;
13-
import static org.assertj.core.api.Assumptions.assumeThat;
1413

14+
@Disabled
1515
class DockerComposeServiceTest extends BaseDockerComposeTest {
1616

1717
@AutoClose
@@ -23,8 +23,6 @@ class DockerComposeServiceTest extends BaseDockerComposeTest {
2323
.withExposedService("redis_1", REDIS_PORT);
2424

2525
DockerComposeServiceTest() {
26-
assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
27-
.doesNotStartWith("Docker Compose version v2");
2826
environment.start();
2927
}
3028

core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package org.testcontainers.junit;
22

33
import org.junit.jupiter.api.AutoClose;
4+
import org.junit.jupiter.api.Disabled;
45
import org.testcontainers.containers.DockerComposeContainer;
5-
import org.testcontainers.utility.CommandLine;
66
import org.testcontainers.utility.DockerImageName;
77

88
import java.io.File;
99

10-
import static org.assertj.core.api.Assumptions.assumeThat;
11-
1210
/**
1311
* Created by rnorth on 21/05/2016.
1412
*/
13+
@Disabled
1514
class DockerComposeV2FormatTest extends BaseDockerComposeTest {
1615

1716
@AutoClose
@@ -22,8 +21,6 @@ class DockerComposeV2FormatTest extends BaseDockerComposeTest {
2221
.withExposedService("redis_1", REDIS_PORT);
2322

2423
DockerComposeV2FormatTest() {
25-
assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
26-
.doesNotStartWith("Docker Compose version v2");
2724
environment.start();
2825
}
2926

core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package org.testcontainers.junit;
22

33
import org.junit.jupiter.api.AutoClose;
4+
import org.junit.jupiter.api.Disabled;
45
import org.testcontainers.containers.DockerComposeContainer;
5-
import org.testcontainers.utility.CommandLine;
66
import org.testcontainers.utility.DockerImageName;
77

88
import java.io.File;
99

10-
import static org.assertj.core.api.Assumptions.assumeThat;
11-
10+
@Disabled
1211
class DockerComposeV2FormatWithIdentifierTest extends BaseDockerComposeTest {
1312

1413
@AutoClose
@@ -20,8 +19,6 @@ class DockerComposeV2FormatWithIdentifierTest extends BaseDockerComposeTest {
2019
.withExposedService("redis_1", REDIS_PORT);
2120

2221
DockerComposeV2FormatWithIdentifierTest() {
23-
assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
24-
.doesNotStartWith("Docker Compose version v2");
2522
environment.start();
2623
}
2724

core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package org.testcontainers.junit;
22

33
import org.junit.jupiter.api.AutoClose;
4+
import org.junit.jupiter.api.Disabled;
45
import org.testcontainers.containers.DockerComposeContainer;
5-
import org.testcontainers.utility.CommandLine;
66
import org.testcontainers.utility.DockerImageName;
77

88
import java.io.File;
99

10-
import static org.assertj.core.api.Assumptions.assumeThat;
11-
10+
@Disabled
1211
class DockerComposeV2WithNetworkTest extends BaseDockerComposeTest {
1312

1413
@AutoClose
@@ -19,8 +18,6 @@ class DockerComposeV2WithNetworkTest extends BaseDockerComposeTest {
1918
.withExposedService("redis_1", REDIS_PORT);
2019

2120
DockerComposeV2WithNetworkTest() {
22-
assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
23-
.doesNotStartWith("Docker Compose version v2");
2421
environment.start();
2522
}
2623

0 commit comments

Comments
 (0)