From 207065ce9f0fbe7f025905d25210add5bbf4165e Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Mon, 6 Dec 2021 15:22:55 +0100
Subject: fix remote run/start flake

Fix the flake reported in #9597 with a workaround to at least stop
wasting energy until the root cause has been found and fixed.

It seems that a remote run returns before the container has transitioned
into the `exited` state which ultimately breaks a subsequent remote
start with attach.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 test/system/035-logs.bats | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'test/system')

diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index 44984eaad..3caf97a22 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -91,6 +91,10 @@ ${cid[0]} d"   "Sequential output from logs"
 
 function _log_test_restarted() {
     run_podman run --log-driver=$1 --name logtest $IMAGE sh -c 'start=0; if test -s log; then start=`tail -n 1 log`; fi; seq `expr $start + 1` `expr $start + 10` | tee -a log'
+    # FIXME: #9597
+    # run/start is flaking for remote so let's wait for the container condition
+    # to stop wasting energy until the root cause gets fixed.
+    run_podman container wait --condition=exited logtest
     run_podman start -a logtest
     logfile=$(mktemp -p ${PODMAN_TMPDIR} logfileXXXXXXXX)
     $PODMAN $_PODMAN_TEST_OPTS logs -f logtest > $logfile
-- 
cgit v1.2.3-54-g00ecf