diff options
author | Chris Evich <cevich@redhat.com> | 2020-12-16 08:55:16 -0500 |
---|---|---|
committer | Chris Evich <cevich@redhat.com> | 2020-12-16 08:55:16 -0500 |
commit | f66ecc882df822260e41de24b1c5f44a1ba3c3ad (patch) | |
tree | 72f8d0b6a014a07c2860904412f0a18c3df1c8d8 | |
parent | 427731ab9c977f1b89b49ff23d3adcffb6212f49 (diff) | |
download | podman-f66ecc882df822260e41de24b1c5f44a1ba3c3ad.tar.gz podman-f66ecc882df822260e41de24b1c5f44a1ba3c3ad.tar.bz2 podman-f66ecc882df822260e41de24b1c5f44a1ba3c3ad.zip |
Fix: unpause not supported for CGv1 rootless
Thanks Ed Santiago <santiago@redhat.com> for the fix.
Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r-- | test/system/600-completion.bats | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/test/system/600-completion.bats b/test/system/600-completion.bats index 1e43cdc41..39906704e 100644 --- a/test/system/600-completion.bats +++ b/test/system/600-completion.bats @@ -8,6 +8,17 @@ load helpers +# Returns true if we are able to podman-pause +function _can_pause() { + # Even though we're just trying completion, not an actual unpause, + # podman barfs with: + # Error: unpause is not supported for cgroupv1 rootless containers + if is_rootless && is_cgroupsv1; then + return 1 + fi + return 0 +} + function check_shell_completion() { local count=0 @@ -70,8 +81,13 @@ function check_shell_completion() { ;; *CONTAINER*) + # podman unpause fails early on rootless cgroupsv1 + if [[ $cmd = "unpause" ]] && ! _can_pause; then + continue 2 + fi + run_completion "$@" $cmd "${extra_args[@]}" "" - is "$output" ".*-$random_container_name${nl}" "Found expected container in suggestions" + is "$output" ".*-$random_container_name${nl}" "Found expected container in suggestions for '$cmd'" match=true # resume @@ -212,7 +228,9 @@ function _check_completion_end() { run_podman create --name created-$random_container_name $IMAGE run_podman run --name running-$random_container_name -d $IMAGE top run_podman run --name pause-$random_container_name -d $IMAGE top - run_podman pause pause-$random_container_name + if _can_pause; then + run_podman pause pause-$random_container_name + fi run_podman run --name exited-$random_container_name -d $IMAGE echo exited # create pods for each state |