aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2017-11-28 13:41:19 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-29 12:15:15 +0000
commite36483b1e644f8fb6f14a62c062ea635fb6851ed (patch)
tree55278869cd60cc491091085f9d1534997ea695f9 /test
parentbbef98621491b79d5b2a397bc17ed4d7967a7aff (diff)
downloadpodman-e36483b1e644f8fb6f14a62c062ea635fb6851ed.tar.gz
podman-e36483b1e644f8fb6f14a62c062ea635fb6851ed.tar.bz2
podman-e36483b1e644f8fb6f14a62c062ea635fb6851ed.zip
Fix tests - use rm -a -f instead of nested commands
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #68 Approved by: rhatdan
Diffstat (limited to 'test')
-rw-r--r--test/kpod_create.bats2
-rw-r--r--test/kpod_export.bats1
-rw-r--r--test/kpod_kill.bats2
-rw-r--r--test/kpod_logs.bats1
-rw-r--r--test/kpod_mount.bats2
-rw-r--r--test/kpod_pause.bats1
-rw-r--r--test/kpod_ps.bats2
-rw-r--r--test/kpod_rm.bats2
-rw-r--r--test/kpod_run.bats2
-rw-r--r--test/kpod_run_ns.bats5
-rw-r--r--test/kpod_stop.bats2
11 files changed, 15 insertions, 7 deletions
diff --git a/test/kpod_create.bats b/test/kpod_create.bats
index 7346834c7..6d7704b5d 100644
--- a/test/kpod_create.bats
+++ b/test/kpod_create.bats
@@ -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
}
diff --git a/test/kpod_export.bats b/test/kpod_export.bats
index 5b8517afc..db4d295d9 100644
--- a/test/kpod_export.bats
+++ b/test/kpod_export.bats
@@ -3,6 +3,7 @@
load helpers
function teardown() {
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
cleanup_test
}
diff --git a/test/kpod_kill.bats b/test/kpod_kill.bats
index c0f01e8b4..6fe67d643 100644
--- a/test/kpod_kill.bats
+++ b/test/kpod_kill.bats
@@ -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
}
diff --git a/test/kpod_logs.bats b/test/kpod_logs.bats
index d5dc8622e..9cac321db 100644
--- a/test/kpod_logs.bats
+++ b/test/kpod_logs.bats
@@ -3,6 +3,7 @@
load helpers
function teardown() {
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
cleanup_test
}
diff --git a/test/kpod_mount.bats b/test/kpod_mount.bats
index 46d10ad2e..400a52fdf 100644
--- a/test/kpod_mount.bats
+++ b/test/kpod_mount.bats
@@ -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
}
diff --git a/test/kpod_pause.bats b/test/kpod_pause.bats
index 3d6ab7b91..812a2e979 100644
--- a/test/kpod_pause.bats
+++ b/test/kpod_pause.bats
@@ -7,6 +7,7 @@ function setup() {
}
function teardown() {
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
cleanup_test
}
diff --git a/test/kpod_ps.bats b/test/kpod_ps.bats
index 99127cb8f..f5641115d 100644
--- a/test/kpod_ps.bats
+++ b/test/kpod_ps.bats
@@ -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
}
diff --git a/test/kpod_rm.bats b/test/kpod_rm.bats
index ad8d43062..74d22e9ea 100644
--- a/test/kpod_rm.bats
+++ b/test/kpod_rm.bats
@@ -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
}
diff --git a/test/kpod_run.bats b/test/kpod_run.bats
index ee21430f8..b132fb546 100644
--- a/test/kpod_run.bats
+++ b/test/kpod_run.bats
@@ -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
}
diff --git a/test/kpod_run_ns.bats b/test/kpod_run_ns.bats
index eb0af6076..cc3a6b211 100644
--- a/test/kpod_run_ns.bats
+++ b/test/kpod_run_ns.bats
@@ -2,6 +2,11 @@
load helpers
+function teardown() {
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
+ cleanup_test
+}
+
function setup() {
copy_images
}
diff --git a/test/kpod_stop.bats b/test/kpod_stop.bats
index 631aa5995..926d0991c 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 `${KPOD_BINARY} ${KPOD_OPTIONS} ps -a -q`"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f -a"
cleanup_test
}