Merge pull request #13593 from Luap99/compose-flakev2

fix compose test error in retry logic

1 files changed, 4 insertions, 5 deletions

diff --git a/test/compose/slirp4netns_opts/tests.sh b/test/compose/slirp4netns_opts/tests.sh
index cfa84e1e4..2d41311ad 100644
--- a/test/compose/slirp4netns_opts/tests.sh
+++ b/test/compose/slirp4netns_opts/tests.sh
@@ -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"