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

Merge pull request #18752 from edsantiago/log_k8s_race

Browse Source 
systests: minimize race-condition window
This commit is contained in:
OpenShift Merge Robot
2023-05-31 10:23:30 -04:00
committed by GitHub
parent 0d7702bd93 0372bf4bdd
commit b9bdfea8e7
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)
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