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

Merge pull request #11815 from edsantiago/bats

Browse Source 
sdnotify test: accept MAINPID anywhere
This commit is contained in:
OpenShift Merge Robot
2021-09-30 20:13:26 -04:00
committed by GitHub
parent 6adf3293a0 cc42321697
commit f96c281f53
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/system/260-sdnotify.bats
View File

@ -70,7 +70,7 @@ function _stop_socat() {
# Check that MAINPID=xxxxx points to a running conmon process # Check that MAINPID=xxxxx points to a running conmon process
function _assert_mainpid_is_conmon() { function _assert_mainpid_is_conmon() {
local mainpid=$(expr "$1" : "MAINPID=\([0-9]\+\)") local mainpid=$(expr "$1" : ".*MAINPID=\([0-9]\+\)")
test -n "$mainpid" || die "Could not parse '$1' as 'MAINPID=nnnn'" test -n "$mainpid" || die "Could not parse '$1' as 'MAINPID=nnnn'"
test -d /proc/$mainpid || die "sdnotify MAINPID=$mainpid - but /proc/$mainpid does not exist" test -d /proc/$mainpid || die "sdnotify MAINPID=$mainpid - but /proc/$mainpid does not exist"
@ -121,7 +121,7 @@ function _assert_mainpid_is_conmon() {
# we look for READY=1 _anywhere_ in the output, not just the last line. # we look for READY=1 _anywhere_ in the output, not just the last line.
is "$output" ".*READY=1.*" "sdnotify sent READY=1" is "$output" ".*READY=1.*" "sdnotify sent READY=1"
_assert_mainpid_is_conmon "${lines[0]}" _assert_mainpid_is_conmon "$output"
# Done. Stop container, clean up. # Done. Stop container, clean up.
run_podman exec $cid touch /stop run_podman exec $cid touch /stop
@ -163,7 +163,7 @@ function _assert_mainpid_is_conmon() {
is "$output" ".*READY=1" "received READY=1 through notify socket" is "$output" ".*READY=1" "received READY=1 through notify socket"
_assert_mainpid_is_conmon "${lines[0]}" _assert_mainpid_is_conmon "$output"
# Done. Stop container, clean up. # Done. Stop container, clean up.
run_podman exec $cid touch /stop run_podman exec $cid touch /stop