Merge pull request #11762 from edsantiago/bats

System tests: speed up. They've gotten too slow.

1 files changed, 19 insertions, 12 deletions

diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index a04d2ac74..76ce12b81 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -135,31 +135,38 @@ function _log_test_until() {
     s_after="after_$(random_string)_${driver}"
 
     before=$(date --iso-8601=seconds)
-    sleep 5
+    sleep 1
     run_podman run --log-driver=$driver -d --name test $IMAGE sh -c \
         "echo $s_before; trap 'echo $s_after; exit' SIGTERM; while :; do sleep 1; done"
 
     # sleep a second to make sure the date is after the first echo
     sleep 1
     run_podman stop test
-    # sleep for 20 seconds to get the proper after time
-    sleep 20
+    run_podman wait test
 
-    run_podman logs test
-    is "$output" \
-        "$s_before
+    # Sigh. Stupid journald has a lag. Wait a few seconds for it to catch up.
+    retries=20
+    s_both="$s_before
 $s_after"
+    while [[ $retries -gt 0 ]]; do
+        run_podman logs test
+        if [[ "$output" = "$s_both" ]]; then
+            break
+        fi
+        retries=$((retries - 1))
+        sleep 0.1
+    done
+    if [[ $retries -eq 0 ]]; then
+        die "Timed out waiting for before&after in podman logs: $output"
+    fi
 
     run_podman logs --until $before test
-    is "$output" \
-        ""
+    is "$output" "" "podman logs --until before"
 
-    after=$(date --iso-8601=seconds)
+    after=$(date --date='+1 second' --iso-8601=seconds)
 
     run_podman logs --until $after test
-    is "$output" \
-        "$s_before
-$s_after"
+    is "$output" "$s_both" "podman logs --until after"
     run_podman rm -f test
 }