summaryrefslogtreecommitdiff
path: root/test/system/040-ps.bats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-27 10:33:30 -0500
committerGitHub <noreply@github.com>2021-01-27 10:33:30 -0500
commitd8f34500088ed50264fba4a770699728099c474a (patch)
treec9afefa6d5237c2725aa2888cb3f0e480b3db3b2 /test/system/040-ps.bats
parent179b9d1745db19cb420b0a8f8d6afa4dfc07dd91 (diff)
parent21cb3043fcae3f9196a2faeddbaba891f9f3f49c (diff)
downloadpodman-d8f34500088ed50264fba4a770699728099c474a.tar.gz
podman-d8f34500088ed50264fba4a770699728099c474a.tar.bz2
podman-d8f34500088ed50264fba4a770699728099c474a.zip
Merge pull request #9095 from rhatdan/ps
podman-remote ps --external --pod --sort do not work.
Diffstat (limited to 'test/system/040-ps.bats')
-rw-r--r--test/system/040-ps.bats17
1 files changed, 8 insertions, 9 deletions
diff --git a/test/system/040-ps.bats b/test/system/040-ps.bats
index 0ae8b0ce0..ae27c479f 100644
--- a/test/system/040-ps.bats
+++ b/test/system/040-ps.bats
@@ -82,11 +82,10 @@ load helpers
run_podman rm -a
}
-@test "podman ps -a --storage" {
- skip_if_remote "ps --storage does not work over remote"
+@test "podman ps -a --external" {
# Setup: ensure that we have no hidden storage containers
- run_podman ps --storage -a
+ run_podman ps --external -a
is "${#lines[@]}" "1" "setup check: no storage containers at start of test"
# Force a buildah timeout; this leaves a buildah container behind
@@ -98,18 +97,18 @@ EOF
run_podman ps -a
is "${#lines[@]}" "1" "podman ps -a does not see buildah container"
- run_podman ps --storage -a
- is "${#lines[@]}" "2" "podman ps -a --storage sees buildah container"
+ run_podman ps --external -a
+ is "${#lines[@]}" "2" "podman ps -a --external sees buildah container"
is "${lines[1]}" \
"[0-9a-f]\{12\} \+$IMAGE *buildah .* seconds ago .* storage .* ${PODMAN_TEST_IMAGE_NAME}-working-container" \
- "podman ps --storage"
+ "podman ps --external"
cid="${lines[1]:0:12}"
# 'rm -a' should be a NOP
run_podman rm -a
- run_podman ps --storage -a
- is "${#lines[@]}" "2" "podman ps -a --storage sees buildah container"
+ run_podman ps --external -a
+ is "${#lines[@]}" "2" "podman ps -a --external sees buildah container"
# We can't rm it without -f, but podman should issue a helpful message
run_podman 2 rm "$cid"
@@ -118,7 +117,7 @@ EOF
# With -f, we can remove it.
run_podman rm -f "$cid"
- run_podman ps --storage -a
+ run_podman ps --external -a
is "${#lines[@]}" "1" "storage container has been removed"
}