Retry internal port checking in the same exec (#4460)

* Retry internal port checking in the same exec

* Use just grep

* Reduce the changeset

Author: bsideup

core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java

@@ -24,18 +24,19 @@ public class InternalCommandPortListeningCheck implements java.util.concurrent.C
 
     @Override
     public Boolean call() {
-        StringBuilder command = new StringBuilder("true");
+        StringBuilder command = new StringBuilder("while true; do ( true ");
 
         for (int internalPort : internalPorts) {
             command.append(" && ");
             command.append(" (");
-            command.append(format("cat /proc/net/tcp* | awk '{print $2}' | grep -i ':0*%x'", internalPort));
+            command.append(format("grep -i ':0*%x' /proc/net/tcp*", internalPort));
             command.append(" || ");
             command.append(format("nc -vz -w 1 localhost %d", internalPort));
             command.append(" || ");
             command.append(format("/bin/bash -c '</dev/tcp/localhost/%d'", internalPort));
             command.append(")");
         }
+        command.append(" ) && exit 0 || sleep 0.1; done");
 
         Instant before = Instant.now();
         try {

core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java

@@ -7,14 +7,13 @@
 import org.junit.runners.Parameterized;
 import org.rnorth.ducttape.TimeoutException;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Arrays.asList;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 @RunWith(Parameterized.class)
 public class InternalCommandPortListeningCheckTest {
@@ -45,9 +44,7 @@ public void singleListening() {
 
         Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
 
-        final Boolean result = check.call();
-
-        assertTrue("InternalCommandPortListeningCheck identifies a single listening port", result);
+        VisibleAssertions.pass("InternalCommandPortListeningCheck identifies a single listening port");
     }
 
     @Test
@@ -56,13 +53,9 @@ public void nonListening() {
 
         try {
             Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
+            VisibleAssertions.fail("expected to fail");
         } catch (TimeoutException e) {
-            // we expect it to timeout
         }
-
-        final Boolean result = check.call();
-
-        assertFalse("InternalCommandPortListeningCheck detects a non-listening port among many", result);
     }
 
     @Test
@@ -71,8 +64,6 @@ public void lowAndHighPortListening() {
 
         Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
 
-        final Boolean result = check.call();
-
-        assertTrue("InternalCommandPortListeningCheck identifies a low and a high port", result);
+        VisibleAssertions.pass("InternalCommandPortListeningCheck identifies a low and a high port");
     }
 }