Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sdnotify test: accept MAINPID anywhere #11815

Merged
merged 1 commit into from
Oct 1, 2021
+3 −3
Merged

sdnotify test: accept MAINPID anywhere #11815

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/system/260-sdnotify.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function _stop_socat() {

# Check that MAINPID=xxxxx points to a running conmon process
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 -d /proc/$mainpid || die "sdnotify MAINPID=$mainpid - but /proc/$mainpid does not exist"
Expand Down Expand Up @@ -121,7 +121,7 @@ function _assert_mainpid_is_conmon() {
# we look for READY=1 _anywhere_ in the output, not just the last line.
is "$output" ".*READY=1.*" "sdnotify sent READY=1"

_assert_mainpid_is_conmon "${lines[0]}"
_assert_mainpid_is_conmon "$output"

# Done. Stop container, clean up.
run_podman exec $cid touch /stop
Expand Down Expand Up @@ -163,7 +163,7 @@ function _assert_mainpid_is_conmon() {

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.
run_podman exec $cid touch /stop
Expand Down