diff options
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/260-sdnotify.bats | 13 | ||||
| -rw-r--r-- | test/system/400-unprivileged-access.bats | 2 | ||||
| -rwxr-xr-x | test/system/helpers.t | 2 |
3 files changed, 12 insertions, 5 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 || \ diff --git a/test/system/400-unprivileged-access.bats b/test/system/400-unprivileged-access.bats index 1b2d14554..142d7dcd9 100644 --- a/test/system/400-unprivileged-access.bats +++ b/test/system/400-unprivileged-access.bats @@ -23,7 +23,7 @@ load helpers # as a user, the parent directory must be world-readable. test_script=$PODMAN_TMPDIR/fail-if-writable cat >$test_script <<"EOF" -#!/bin/bash +#!/usr/bin/env bash path="$1" diff --git a/test/system/helpers.t b/test/system/helpers.t index bee09505c..7a331174b 100755 --- a/test/system/helpers.t +++ b/test/system/helpers.t @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # regression tests for helpers.bash # |