Ensure that nginx test waits properly to reduce flakiness

testcontainers · Aug 5, 2018 · 8541d62 · 8541d62
1 parent 3012e8e
commit 8541d62
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -5,7 +5,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -22,7 +22,7 @@ public NginxContainer() {
     @NotNull
     @Override
     protected Set<Integer> getLivenessCheckPorts() {
-        return new HashSet<>(getMappedPort(80));
+        return Collections.singleton(getMappedPort(80));
     }
 
     @Override

diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -5,12 +5,13 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.NginxContainer;
-import org.testcontainers.containers.wait.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 
 import java.io.*;
 import java.net.URLConnection;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.rnorth.visibleassertions.VisibleAssertions.info;
 
 
 /**
@@ -22,9 +23,10 @@ public class SimpleNginxTest {
 
     @Rule
     public NginxContainer nginx = new NginxContainer<>()
-            .withCustomContent(contentFolder.toString())
-            .waitingFor(new HttpWaitStrategy());
+        .withCustomContent(contentFolder.toString())
+        .waitingFor(new HttpWaitStrategy());
 
+    @SuppressWarnings({"Duplicates", "ResultOfMethodCallIgnored"})
     @BeforeClass
     public static void setupContent() throws FileNotFoundException {
         contentFolder.mkdir();