Fix flaking rootless compose test

The compose port test is flaking with an empty curl result. The curl retry
does not work properly. Given the the tests never expect an empty result
lets just wait one second and retry again.
Unfortunately there is no way for me to actually verify if this will fix
the flake.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
This commit is contained in:
Paul Holzinger
2021-04-07 11:41:15 +02:00
parent 6d0c554cbb
commit 42e4609faf

View File

@ -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"