forked from containers/podman
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request containers#13593 from Luap99/compose-flakev2
fix compose test error in retry logic
- Loading branch information
Showing
1 changed file
with
4 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,19 @@ | ||
# -*- bash -*- | ||
|
||
output="$(cat $OUTFILE)" | ||
expected="teststring" | ||
|
||
# Reading from the nc socket is flaky because docker-compose only starts | ||
# the containers. We cannot know at this point if the container did already | ||
# send the message. Give the container 5 seconds time to send the message | ||
# to prevent flakes. | ||
local _timeout=5 | ||
while [ $_timeout -gt 0 ]; do | ||
container_timeout=5 | ||
while [ $container_timeout -gt 0 ]; do | ||
output="$(< $OUTFILE)" | ||
if [ -n "$output" ]; then | ||
break | ||
fi | ||
sleep 1 | ||
_timeout=$(($_timeout - 1)) | ||
output="$(cat $OUTFILE)" | ||
container_timeout=$(($container_timeout - 1)) | ||
done | ||
|
||
is "$output" "$expected" "$testname : nc received teststring" |