diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-17 12:16:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 12:16:32 +0200 |
| commit | 1db18bf10775cf0502d7e9be4946d1d29a6d8e06 (patch) | |
| tree | 3776da48d51801850fbc854583b2b148cf08ce7c | |
| parent | fff66f14305599bc08504f437d3769cb51797caa (diff) | |
| parent | 60ab5f3ae66e04be83ec4f83ad4b29b6e294110c (diff) | |
| download | podman-1db18bf10775cf0502d7e9be4946d1d29a6d8e06.tar.gz podman-1db18bf10775cf0502d7e9be4946d1d29a6d8e06.tar.bz2 podman-1db18bf10775cf0502d7e9be4946d1d29a6d8e06.zip | |
Merge pull request #7317 from edsantiago/bats
system tests: enable sdnotify tests
| -rw-r--r-- | test/system/260-sdnotify.bats | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats index c37eea15a..6bc9fc02e 100644 --- a/test/system/260-sdnotify.bats +++ b/test/system/260-sdnotify.bats @@ -12,8 +12,15 @@ _SOCAT_LOG= function setup() { skip_if_remote - # TODO: remove this once CI systems have newer crun and container-selinux - skip "TEMPORARY SKIP - until CI systems get new crun, container-selinux" + # Skip if systemd is not running + systemctl list-units &>/dev/null || skip "systemd not available" + + # sdnotify fails with runc 1.0.0-3-dev2 on Ubuntu. Let's just + # assume that we work only with crun, nothing else. + run_podman info --format '{{ .Host.OCIRuntime.Name }}' + if [[ "$output" != "crun" ]]; then + skip "this test only works with crun, not '$output'" + fi basic_setup } @@ -107,7 +114,7 @@ function _assert_mainpid_is_conmon() { @test "sdnotify : container" { # Sigh... we need to pull a humongous image because it has systemd-notify. # FIXME: is there a smaller image we could use? - _FEDORA=registry.fedoraproject.org/fedora:latest + _FEDORA=registry.fedoraproject.org/fedora:31 # Pull that image. Retry in case of flakes. run_podman pull $_FEDORA || \ |