Fix test syntax

Remove the use of bash -c unless it involves a bash pipe. Also, use
run test_runner.sh inside script so that centos can be happy.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #239
Approved by: baude

1 files changed, 39 insertions, 39 deletions

diff --git a/test/podman_ps.bats b/test/podman_ps.bats
index b99c84304..8f2232cbf 100644
--- a/test/podman_ps.bats
+++ b/test/podman_ps.bats
@@ -12,92 +12,92 @@ function teardown() {
 }
 
 @test "podman ps with no containers" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps default" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps all flag" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps size flag" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --size"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --size
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps quiet flag" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     ctr_id="$output"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --quiet"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --quiet
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps latest flag" {
-    run  bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run  ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps --latest"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps --latest
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps last flag" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${BB} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${BB} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls -s"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls -s
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps --last 2"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps --last 2
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps no-trunc flag" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --no-trunc"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --no-trunc
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps namespace flag" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps --all --namespace"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps --all --namespace
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps namespace flag and format flag = json" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
     run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --ns --format json | python -m json.tool | grep namespace"
@@ -106,7 +106,7 @@ function teardown() {
 }
 
 @test "podman ps without namespace flag and format flag = json" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
     run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --format json | python -m json.tool | grep namespace"
@@ -115,76 +115,76 @@ function teardown() {
 }
 
 @test "podman ps format flag = go template" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --format 'table {{.ID}} {{.Image}} {{.Labels}}'"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --format 'table {{.ID}} {{.Image}} {{.Labels}}'
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps filter flag - ancestor" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --filter ancestor=${ALPINE}"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --filter ancestor=${ALPINE}
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps filter flag - id" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} ls
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --filter id=$ctr_id"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --filter id=$ctr_id
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps filter flag - status" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} sleep 99"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} sleep 99
     ctr_id="$output"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --filter status=running"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --filter status=running
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} stop $ctr_id"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} stop $ctr_id
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps short options" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} sleep 99"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} sleep 99
     ctr_id="$output"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -aq"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -aq
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} stop $ctr_id"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} stop $ctr_id
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman ps with mutually exclusive flags" {
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} sleep 99"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d ${ALPINE} sleep 99
     ctr_id="$output"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -aqs"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -aqs
     echo "$output"
     [ "$status" -ne 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --ns -s"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --ns -s
     echo "$output"
     [ "$status" -ne 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --ns format {{.ID}}"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --ns format {{.ID}}
     echo "$output"
     [ "$status" -ne 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --ns --format json"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} ps -a --ns --format json
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} stop $ctr_id"
+    run ${PODMAN_BINARY} ${PODMAN_OPTIONS} stop $ctr_id
     echo "$output"
     [ "$status" -eq 0 ]
 }