opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

systests: minimize race-condition window

Browse Source 
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 <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2023-05-31 05:39:15 -06:00
parent b7d4da671b
commit 0372bf4bdd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/system/035-logs.bats
View File

@ -181,7 +181,7 @@ function _log_test_since() {
before=$(date --iso-8601=seconds) before=$(date --iso-8601=seconds)
run_podman run --log-driver=$driver -d --name test $IMAGE sh -c \ 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 a second to make sure the date is after the first echo
sleep 1 sleep 1
@ -223,7 +223,7 @@ function _log_test_until() {
before=$(date --iso-8601=seconds) before=$(date --iso-8601=seconds)
sleep 1 sleep 1
run_podman run --log-driver=$driver -d --name test $IMAGE sh -c \ 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 a second to make sure the date is after the first echo
sleep 1 sleep 1
@ -248,7 +248,7 @@ $s_after"
run_podman logs --until $before test run_podman logs --until $before test
is "$output" "" "podman logs --until before" 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 run_podman logs --until $after test
is "$output" "$s_both" "podman logs --until after" is "$output" "$s_both" "podman logs --until after"
@ -355,7 +355,7 @@ function _log_test_follow_until() {
fi fi
run_podman ${events_backend} run --log-driver=$driver --name $cname -d $IMAGE \ 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 t0=$SECONDS
# The logs command should exit after the until time even when follow is set # The logs command should exit after the until time even when follow is set