summaryrefslogtreecommitdiff
path: root/test/system
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-12-15 15:43:11 +0100
committerGitHub <noreply@github.com>2021-12-15 15:43:11 +0100
commit9212c74ff180ee6090a1d4ff77999c19b613c7b6 (patch)
tree87ea90a403b1cb290272025ac67867cb27597505 /test/system
parent7dabcbd7bcf78f3b5d310ed547801106da382618 (diff)
parent51a4bef2e62b500457bcd473a1d97ca150f4d1b4 (diff)
downloadpodman-9212c74ff180ee6090a1d4ff77999c19b613c7b6.tar.gz
podman-9212c74ff180ee6090a1d4ff77999c19b613c7b6.tar.bz2
podman-9212c74ff180ee6090a1d4ff77999c19b613c7b6.zip
Merge pull request #12600 from rhatdan/external
Show --external containers even without --all option
Diffstat (limited to 'test/system')
-rw-r--r--test/system/040-ps.bats12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/system/040-ps.bats b/test/system/040-ps.bats
index 09a0f8de1..61b290415 100644
--- a/test/system/040-ps.bats
+++ b/test/system/040-ps.bats
@@ -83,10 +83,10 @@ load helpers
run_podman rm -a
}
-@test "podman ps -a --external" {
+@test "podman ps --external" {
# Setup: ensure that we have no hidden storage containers
- run_podman ps --external -a
+ run_podman ps --external
is "${#lines[@]}" "1" "setup check: no storage containers at start of test"
# Force a buildah timeout; this leaves a buildah container behind
@@ -107,7 +107,7 @@ EOF
run_podman ps -a
is "${#lines[@]}" "1" "podman ps -a does not see buildah containers"
- run_podman ps --external -a
+ run_podman ps --external
is "${#lines[@]}" "3" "podman ps -a --external sees buildah containers"
is "${lines[1]}" \
"[0-9a-f]\{12\} \+$IMAGE *buildah .* seconds ago .* storage .* ${PODMAN_TEST_IMAGE_NAME}-working-container" \
@@ -115,7 +115,7 @@ EOF
# 'rm -a' should be a NOP
run_podman rm -a
- run_podman ps --external -a
+ run_podman ps --external
is "${#lines[@]}" "3" "podman ps -a --external sees buildah containers"
# Cannot prune intermediate image as it's being used by a buildah
@@ -128,7 +128,7 @@ EOF
is "${#lines[@]}" "1" "Image used by build container is pruned"
# One buildah container has been removed.
- run_podman ps --external -a
+ run_podman ps --external
is "${#lines[@]}" "2" "podman ps -a --external sees buildah containers"
cid="${lines[1]:0:12}"
@@ -140,7 +140,7 @@ EOF
# With -f, we can remove it.
run_podman rm -t 0 -f "$cid"
- run_podman ps --external -a
+ run_podman ps --external
is "${#lines[@]}" "1" "storage container has been removed"
}