opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 03:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9961 from Luap99/fix-compose-flake

Browse Source 
Fix flaking rootless compose test
This commit is contained in:
OpenShift Merge Robot
2021-04-07 08:16:38 -04:00
committed by GitHub
parent 6d0c554cbb 42e4609faf
commit b8a4494b10
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/compose/test-compose
View File

@ -163,7 +163,13 @@ function test_port() {
local op="$2" # '=' or '~' local op="$2" # '=' or '~'
local expect="$3" # what to expect from curl output 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=$? local curl_rc=$?
if [ $curl_rc -ne 0 ]; then if [ $curl_rc -ne 0 ]; then
_show_ok 0 "$testname - curl failed with status $curl_rc" _show_ok 0 "$testname - curl failed with status $curl_rc"