Skip to content

Commit f077c46

Browse files
committed
fix: remove testing for OS X and use socat in all test cases
1 parent c3f426e commit f077c46

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

parsec-testcontainers/src/main/java/org/parallaxsecond/testcontainers/ParsecContainer.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.nio.file.attribute.PosixFilePermissions;
88
import java.time.Duration;
99
import static java.util.Collections.singletonList;
10-
import java.util.Locale;
1110
import java.util.concurrent.ExecutorService;
1211
import java.util.concurrent.Executors;
1312

@@ -26,7 +25,7 @@
2625
public class ParsecContainer extends GenericContainer<ParsecContainer> {
2726
private static final String IMAGE_NAME = "parallaxsecond/parsec";
2827
private static final String PARSEC_SOCKET_FILE = "parsec.sock";
29-
private static final String PARSEC_RUN_DIR = "/parsec/quickstart/";
28+
private static final String PARSEC_RUN_DIR = "/run/parsec/";
3029
private static final String PARSEC_SOCKET = PARSEC_RUN_DIR + PARSEC_SOCKET_FILE;
3130
private static final int PARSEC_TCP_PORT = 4444;
3231
private final int localPort = findFreePort();
@@ -68,13 +67,9 @@ public boolean isRunning() {
6867
public static ParsecContainer withVersion(String version) {
6968
ParsecContainer parsecContainer =
7069
new ParsecContainer(DockerImageName.parse(IMAGE_NAME + ":" + version));
71-
7270
parsecContainer.start();
73-
7471
// Wait for container to be running
7572
Awaitility.await().until(parsecContainer::isRunning);
76-
77-
7873
return parsecContainer;
7974
}
8075

@@ -95,18 +90,10 @@ public URI getSocketUri() {
9590

9691
@Override
9792
public void start() {
98-
if (isOsx()) {
99-
useSocat();
100-
} else {
101-
}
93+
useSocat();
10294
super.start();
10395
}
10496

105-
private static boolean isOsx() {
106-
String os = System.getProperty("os.name", "generic").toLowerCase(Locale.ENGLISH);
107-
return ((os.contains("mac")) || (os.contains("darwin")));
108-
}
109-
11097
@Override
11198
public void close() {
11299
if (this.cmd != null) {
@@ -136,7 +123,6 @@ public void useSocat() {
136123
Awaitility.await().until(() -> {
137124
return Files.exists(this.parsecSockSocat);
138125
});
139-
140126
}
141127

142128
@SneakyThrows

0 commit comments

Comments
 (0)