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:
Matthew Heon 2017-11-28 13:41:19 -05:00 committed by Atomic Bot
parent bbef986214
commit e36483b1e6
11 changed files with 15 additions and 7 deletions

View File

@ -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
}

View File

@ -3,6 +3,7 @@
load helpers
function teardown() {
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
cleanup_test
}

View File

@ -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
}

View File

@ -3,6 +3,7 @@
load helpers
function teardown() {
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
cleanup_test
}

View File

@ -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
}

View File

@ -7,6 +7,7 @@ function setup() {
}
function teardown() {
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
cleanup_test
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -2,6 +2,11 @@
load helpers
function teardown() {
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
cleanup_test
}
function setup() {
copy_images
}

View File

@ -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
}