diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-20 11:22:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 11:22:43 -0400 |
| commit | 36682115b0f3f5f7cfcc6bc4580e5a7435b9a4d8 (patch) | |
| tree | 9883d07d47e45ad05b53d1fa626d33b342ba5d5e /test/system | |
| parent | 6c0b600e7d49d17db6eedd21b755b5d4f1a15b11 (diff) | |
| parent | 1b4933376f4e6738ff3a0c42a2e27c6d21c07e7c (diff) | |
| download | podman-36682115b0f3f5f7cfcc6bc4580e5a7435b9a4d8.tar.gz podman-36682115b0f3f5f7cfcc6bc4580e5a7435b9a4d8.tar.bz2 podman-36682115b0f3f5f7cfcc6bc4580e5a7435b9a4d8.zip | |
Merge pull request #7126 from mheon/fix_missing_ociruntime
Fix missing OCI Runtime
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/030-run.bats | 13 | ||||
| -rw-r--r-- | test/system/helpers.bash | 10 |
2 files changed, 23 insertions, 0 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 28dc7c7a7..9f4037730 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -460,4 +460,17 @@ json-file | f is "$output" "$expect" "podman run with --tz=local, matches host" } +# run with --runtime should preserve the named runtime +@test "podman run : full path to --runtime is preserved" { + skip_if_cgroupsv1 + skip_if_remote + run_podman run -d --runtime '/usr/bin/crun' $IMAGE sleep 60 + cid="$output" + + run_podman inspect --format '{{.OCIRuntime}}' $cid + is "$output" "/usr/bin/crun" + + run_podman kill $cid +} + # vim: filetype=sh diff --git a/test/system/helpers.bash b/test/system/helpers.bash index 73cf1e5b2..2cced10c2 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -253,6 +253,7 @@ function is_cgroupsv1() { ! is_cgroupsv2 } +# True if cgroups v2 are enabled function is_cgroupsv2() { cgroup_type=$(stat -f -c %T /sys/fs/cgroup) test "$cgroup_type" = "cgroup2fs" @@ -305,6 +306,15 @@ function skip_if_no_selinux() { fi } +####################### +# skip_if_cgroupsv1 # ...with an optional message +####################### +function skip_if_cgroupsv1() { + if ! is_cgroupsv2; then + skip "${1:-test requires cgroupsv2}" + fi +} + ######### # die # Abort with helpful message ######### |