diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-20 11:05:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 11:05:01 -0400 |
| commit | 47b6a5acdc087de748377dacaaf43b4a557072f3 (patch) | |
| tree | 39c749107504e7fecf6eb7f61c2de9eeaff4ac70 /test | |
| parent | 651fbacc35b8fcd2b170357548c1f6272ae2c48b (diff) | |
| parent | 5fc7c880a9852fdb4d05ab1582f318f43b6e58ea (diff) | |
| download | podman-47b6a5acdc087de748377dacaaf43b4a557072f3.tar.gz podman-47b6a5acdc087de748377dacaaf43b4a557072f3.tar.bz2 podman-47b6a5acdc087de748377dacaaf43b4a557072f3.zip | |
Merge pull request #11294 from vrothberg/3.3-notify-proxy
[3.3] Implement SD-NOTIFY proxy in conmon
Diffstat (limited to 'test')
| -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 |