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

Merge pull request #12791 from edsantiago/bats

Browse Source 
System tests: fix RHEL8 gating tests
This commit is contained in:
OpenShift Merge Robot
2022-01-10 22:13:07 +01:00
committed by GitHub
parent 87cd4b698c 508f9b76ea
commit f687f959e8
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/system/010-images.bats
View File

@ -272,6 +272,10 @@ Deleted: $pauseID" "infra images gets removed as well"
is "$output" "" is "$output" ""
run_podman create --pod new:$pname $IMAGE run_podman create --pod new:$pname $IMAGE
# Clean up
run_podman rm "${lines[-1]}"
run_podman pod rm -a
run_podman rmi $pauseImage
} }
@test "podman images - rmi -f can remove infra images" { @test "podman images - rmi -f can remove infra images" {

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

@ -90,14 +90,16 @@ ${cid[0]} d" "Sequential output from logs"
} }
function _log_test_restarted() { 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' local driver=$1
local events_backend=$(_additional_events_backend $driver)
run_podman run --log-driver=$driver ${events_backend} --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 # FIXME: #9597
# run/start is flaking for remote so let's wait for the container condition # run/start is flaking for remote so let's wait for the container condition
# to stop wasting energy until the root cause gets fixed. # to stop wasting energy until the root cause gets fixed.
run_podman container wait --condition=exited logtest run_podman container wait --condition=exited logtest
run_podman start -a logtest run_podman ${events_backend} start -a logtest
logfile=$(mktemp -p ${PODMAN_TMPDIR} logfileXXXXXXXX) logfile=$(mktemp -p ${PODMAN_TMPDIR} logfileXXXXXXXX)
$PODMAN $_PODMAN_TEST_OPTS logs -f logtest > $logfile $PODMAN $_PODMAN_TEST_OPTS ${events_backend} logs -f logtest > $logfile
expected=$(mktemp -p ${PODMAN_TMPDIR} expectedXXXXXXXX) expected=$(mktemp -p ${PODMAN_TMPDIR} expectedXXXXXXXX)
seq 1 20 > $expected seq 1 20 > $expected
diff -u ${expected} ${logfile} diff -u ${expected} ${logfile}