From 6aba1e7df2506404ee597290416642b9de8344d0 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 7 Nov 2016 22:15:06 +0000
Subject: [PATCH 1/2] Improve reliability of HostPortWaitStrategyTest

---
 .../org/testcontainers/junit/wait/HostPortWaitStrategyTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/junit/wait/HostPortWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/HostPortWaitStrategyTest.java
index a4808211f84..114750c6d0f 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/HostPortWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/HostPortWaitStrategyTest.java
@@ -18,7 +18,7 @@ public class HostPortWaitStrategyTest extends AbstractWaitStrategyTest<HostPortW
      */
     @Test
     public void testWaitUntilReady_Success() {
-        waitUntilReadyAndSucceed("nc -lp 8080");
+        waitUntilReadyAndSucceed("while true; do nc -lp 8080; done");
     }
 
     /**

From 58b9eff97a720253aba59c309007da9a5e7204f5 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 13 Nov 2016 10:02:26 +0000
Subject: [PATCH 2/2] Apply command retry loop for HttpWaitStrategyTest to
 reduce risk of container-led test flapping (same as for
 HostPortWaitStrategyTest)

---
 .../org/testcontainers/junit/wait/HttpWaitStrategyTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/junit/wait/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/HttpWaitStrategyTest.java
index ec99c4bf6b7..2c345ae6ca4 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/HttpWaitStrategyTest.java
@@ -23,7 +23,7 @@ public class HttpWaitStrategyTest extends AbstractWaitStrategyTest<HttpWaitStrat
      */
     @Test
     public void testWaitUntilReady_Success() {
-        waitUntilReadyAndSucceed("echo -e \"HTTP/1.1 200 OK" + DOUBLE_NEWLINE + "\" | nc -lp 8080");
+        waitUntilReadyAndSucceed("while true; do echo -e \"HTTP/1.1 200 OK" + DOUBLE_NEWLINE + "\" | nc -lp 8080; done");
     }
 
     /**
@@ -32,7 +32,7 @@ public void testWaitUntilReady_Success() {
      */
     @Test
     public void testWaitUntilReady_Timeout() {
-        waitUntilReadyAndTimeout("echo -e \"HTTP/1.1 400 Bad Request" + DOUBLE_NEWLINE + "\" | nc -lp 8080");
+        waitUntilReadyAndTimeout("while true; do echo -e \"HTTP/1.1 400 Bad Request" + DOUBLE_NEWLINE + "\" | nc -lp 8080; done");
     }
 
     /**