From 0372bf4bdd795c90bc3f7d3ab98642cb72c45fcd Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 31 May 2023 05:39:15 -0600 Subject: [PATCH] systests: minimize race-condition window Reduce sleep-loop time in logs test, from 1s to 0.1s, to make 'podman stop' take effect more quickly. With 1s, and testing with 1s resolution, we get flakes. Fixes: #17826 Signed-off-by: Ed Santiago --- test/system/035-logs.bats | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index 2c32769d83..aa33d5cc04 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -181,7 +181,7 @@ function _log_test_since() { before=$(date --iso-8601=seconds) 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" + "echo $s_before; trap 'echo $s_after; exit' SIGTERM; while :; do sleep 0.1; done" # sleep a second to make sure the date is after the first echo sleep 1 @@ -223,7 +223,7 @@ function _log_test_until() { before=$(date --iso-8601=seconds) 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" + "echo $s_before; trap 'echo $s_after; exit' SIGTERM; while :; do sleep 0.1; done" # sleep a second to make sure the date is after the first echo sleep 1 @@ -248,7 +248,7 @@ $s_after" run_podman logs --until $before test is "$output" "" "podman logs --until before" - after=$(date --date='+1 second' --iso-8601=seconds) + after=$(date --date='+1 second' --iso-8601=ns) run_podman logs --until $after test is "$output" "$s_both" "podman logs --until after" @@ -355,7 +355,7 @@ function _log_test_follow_until() { fi run_podman ${events_backend} run --log-driver=$driver --name $cname -d $IMAGE \ - sh -c "n=1;while :; do echo $content--\$n; n=\$((n+1));sleep 1; done" + sh -c "n=1;while :; do echo $content--\$n; n=\$((n+1));sleep 0.1; done" t0=$SECONDS # The logs command should exit after the until time even when follow is set