diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-23 04:15:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 04:15:14 -0400 |
| commit | 2f79497aba90229664c35fb738704d61e4528f44 (patch) | |
| tree | 3f40c2a8f726d6326add07ed3600046277a4e3e9 | |
| parent | e6fb92f4782e2405d051c0ff1fcd13796c4cd575 (diff) | |
| parent | 8f9d33b7f738d0f7b51b44aa76cd6639415ec9c8 (diff) | |
| download | podman-2f79497aba90229664c35fb738704d61e4528f44.tar.gz podman-2f79497aba90229664c35fb738704d61e4528f44.tar.bz2 podman-2f79497aba90229664c35fb738704d61e4528f44.zip | |
Merge pull request #11027 from edsantiago/bats
Networking test: fix silent breakage
| -rw-r--r-- | test/system/500-networking.bats | 2 | ||||
| -rw-r--r-- | test/system/helpers.bash | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats index 419d325b0..495c7948b 100644 --- a/test/system/500-networking.bats +++ b/test/system/500-networking.bats @@ -139,7 +139,7 @@ load helpers $IMAGE nc -l -n -v -p $myport cid="$output" - wait_for_port 127.0.0.1 $myport + wait_for_output "listening on .*:$myport .*" $cid # emit random string, and check it teststring=$(random_string 30) diff --git a/test/system/helpers.bash b/test/system/helpers.bash index 02fd7252c..bd9471ace 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -288,7 +288,7 @@ function wait_for_port() { # Wait while [ $_timeout -gt 0 ]; do - { exec 3<> /dev/tcp/$host/$port; } &>/dev/null && return + { exec 5<> /dev/tcp/$host/$port; } &>/dev/null && return sleep 1 _timeout=$(( $_timeout - 1 )) done |