diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-07 08:16:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 08:16:38 -0400 |
| commit | b8a4494b102a84e21e267ad1242e4af9ca413f2f (patch) | |
| tree | 6227fe16778f6c8dcaff9c1e3bdb946fa3d4cc16 | |
| parent | 6d0c554cbb36bbfda786fb2e4b12239af91781cb (diff) | |
| parent | 42e4609faf2adc4c6c81a1fb700b064b28497781 (diff) | |
| download | podman-b8a4494b102a84e21e267ad1242e4af9ca413f2f.tar.gz podman-b8a4494b102a84e21e267ad1242e4af9ca413f2f.tar.bz2 podman-b8a4494b102a84e21e267ad1242e4af9ca413f2f.zip | |
Merge pull request #9961 from Luap99/fix-compose-flake
Fix flaking rootless compose test
| -rwxr-xr-x | test/compose/test-compose | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/compose/test-compose b/test/compose/test-compose index 704c71a9f..7693041ac 100755 --- a/test/compose/test-compose +++ b/test/compose/test-compose @@ -163,7 +163,13 @@ function test_port() { local op="$2" # '=' or '~' local expect="$3" # what to expect from curl output - local actual=$(curl --retry 10 --retry-all-errors -s http://127.0.0.1:$port/) + local actual=$(curl --retry 3 --retry-all-errors -s http://127.0.0.1:$port/) + # The test is flaking with an empty result. The curl retry doesn't solve this. + # If the result is empty sleep one second and try again. + if [[ "$actual" == "" ]]; then + sleep 1 + local actual=$(curl --retry 3 --retry-all-errors -s http://127.0.0.1:$port/) + fi local curl_rc=$? if [ $curl_rc -ne 0 ]; then _show_ok 0 "$testname - curl failed with status $curl_rc" |