diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-20 07:10:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-20 07:10:34 -0400 |
commit | 7d8650cce82e67fb998b9f8a89c66a51b4c98285 (patch) | |
tree | 757b724f94af33be8fee12658f7f55d81db92f4f /test/system/260-sdnotify.bats | |
parent | 30b036c5d394bb523fa13074b1731ad4b6259693 (diff) | |
parent | c22f3e8b4e2593ca81d08924889f7e7251c83089 (diff) | |
download | podman-7d8650cce82e67fb998b9f8a89c66a51b4c98285.tar.gz podman-7d8650cce82e67fb998b9f8a89c66a51b4c98285.tar.bz2 podman-7d8650cce82e67fb998b9f8a89c66a51b4c98285.zip |
Merge pull request #11246 from vrothberg/sdnotify=container
Implement SD-NOTIFY proxy in conmon
Diffstat (limited to 'test/system/260-sdnotify.bats')
-rw-r--r-- | test/system/260-sdnotify.bats | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats index acb30de47..b5d3f9b86 100644 --- a/test/system/260-sdnotify.bats +++ b/test/system/260-sdnotify.bats @@ -130,6 +130,8 @@ function _assert_mainpid_is_conmon() { _stop_socat } +# These tests can fail in dev. environment because of SELinux. +# quick fix: chcon -t container_runtime_exec_t ./bin/podman @test "sdnotify : container" { # Sigh... we need to pull a humongous image because it has systemd-notify. # (IMPORTANT: fedora:32 and above silently removed systemd-notify; this @@ -150,7 +152,7 @@ function _assert_mainpid_is_conmon() { wait_for_ready $cid run_podman logs $cid - is "${lines[0]}" "/.*/container\.sock/notify" "NOTIFY_SOCKET is passed to container" + is "${lines[0]}" "/run/notify/notify.sock" "NOTIFY_SOCKET is passed to container" # With container, READY=1 isn't necessarily the last message received; # just look for it anywhere in received messages |