summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2017-11-28 17:41:20 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-29 12:15:16 +0000
commit63c09d1017e3c160f7cb2126b7994809753064cf (patch)
tree6a5e02fb2b5344def6f81b2c74afda954af455eb
parented41a290a2115ff45b4ce7bfda662aa88d6d314b (diff)
downloadpodman-63c09d1017e3c160f7cb2126b7994809753064cf.tar.gz
podman-63c09d1017e3c160f7cb2126b7994809753064cf.tar.bz2
podman-63c09d1017e3c160f7cb2126b7994809753064cf.zip
Fix kpod rm tests returning error code when they should not
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #68 Approved by: rhatdan
-rw-r--r--test/kpod_rm.bats6
-rw-r--r--test/kpod_stop.bats2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/kpod_rm.bats b/test/kpod_rm.bats
index 74d22e9ea..b84cb2de5 100644
--- a/test/kpod_rm.bats
+++ b/test/kpod_rm.bats
@@ -48,7 +48,7 @@ function teardown() {
ctr_id="$output"
run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rm -f "$ctr_id"
echo "$output"
- [ "$status" -eq 1 ]
+ [ "$status" -eq 0 ]
}
@test "remove all containers" {
@@ -58,7 +58,7 @@ function teardown() {
${KPOD_BINARY} ${KPOD_OPTIONS} create $BB whoami
run ${KPOD_BINARY} $KPOD_OPTIONS rm -a
echo "$output"
- [ "$status" -eq 1 ]
+ [ "$status" -eq 0 ]
}
@test "remove all containers with one running" {
@@ -68,5 +68,5 @@ function teardown() {
${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 30
run ${KPOD_BINARY} $KPOD_OPTIONS rm -a -f
echo "$output"
- [ "$status" -eq 1 ]
+ [ "$status" -eq 0 ]
}
diff --git a/test/kpod_stop.bats b/test/kpod_stop.bats
index 926d0991c..89a20f0f2 100644
--- a/test/kpod_stop.bats
+++ b/test/kpod_stop.bats
@@ -3,7 +3,7 @@
load helpers
function teardown() {
- run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm --force --all"
cleanup_test
}