mirror of https://github.com/containers/podman.git
Fix tests - use rm -a -f instead of nested commands
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #68 Approved by: rhatdan
This commit is contained in:
parent
bbef986214
commit
e36483b1e6
|
@ -7,7 +7,7 @@ function setup() {
|
|||
}
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f `${KPOD_BINARY} ${KPOD_OPTIONS} ps -a -q`"
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
load helpers
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
load helpers
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f `${KPOD_BINARY} ${KPOD_OPTIONS} ps -a -q`"
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm --force --all"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
load helpers
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ load helpers
|
|||
IMAGE="redis:alpine"
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f `${KPOD_BINARY} ${KPOD_OPTIONS} ps -a -q`"
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@ function setup() {
|
|||
}
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ function setup() {
|
|||
}
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f `${KPOD_BINARY} ${KPOD_OPTIONS} ps -a -q`"
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm --force --all"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ function setup() {
|
|||
}
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f `${KPOD_BINARY} ${KPOD_OPTIONS} ps -a -q`"
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm --force --all"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
load helpers
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f `${KPOD_BINARY} ${KPOD_OPTIONS} ps -a -q`"
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
|
@ -2,6 +2,11 @@
|
|||
|
||||
load helpers
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
function setup() {
|
||||
copy_images
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
load helpers
|
||||
|
||||
function teardown() {
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f `${KPOD_BINARY} ${KPOD_OPTIONS} ps -a -q`"
|
||||
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
|
||||
cleanup_test
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue