mirror of
https://github.com/containers/podman.git
synced 2025-10-11 16:26:00 +08:00
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
This commit is contained in:
@ -48,7 +48,7 @@ function teardown() {
|
|||||||
ctr_id="$output"
|
ctr_id="$output"
|
||||||
run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rm -f "$ctr_id"
|
run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rm -f "$ctr_id"
|
||||||
echo "$output"
|
echo "$output"
|
||||||
[ "$status" -eq 1 ]
|
[ "$status" -eq 0 ]
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "remove all containers" {
|
@test "remove all containers" {
|
||||||
@ -58,7 +58,7 @@ function teardown() {
|
|||||||
${KPOD_BINARY} ${KPOD_OPTIONS} create $BB whoami
|
${KPOD_BINARY} ${KPOD_OPTIONS} create $BB whoami
|
||||||
run ${KPOD_BINARY} $KPOD_OPTIONS rm -a
|
run ${KPOD_BINARY} $KPOD_OPTIONS rm -a
|
||||||
echo "$output"
|
echo "$output"
|
||||||
[ "$status" -eq 1 ]
|
[ "$status" -eq 0 ]
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "remove all containers with one running" {
|
@test "remove all containers with one running" {
|
||||||
@ -68,5 +68,5 @@ function teardown() {
|
|||||||
${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 30
|
${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 30
|
||||||
run ${KPOD_BINARY} $KPOD_OPTIONS rm -a -f
|
run ${KPOD_BINARY} $KPOD_OPTIONS rm -a -f
|
||||||
echo "$output"
|
echo "$output"
|
||||||
[ "$status" -eq 1 ]
|
[ "$status" -eq 0 ]
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
load helpers
|
load helpers
|
||||||
|
|
||||||
function teardown() {
|
function teardown() {
|
||||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
|
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm --force --all"
|
||||||
cleanup_test
|
cleanup_test
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user