From 1d7884b9a4f8c22bfcd2c4b76ce27de7ba949e79 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Thu, 18 Jan 2018 08:22:07 -0600
Subject: 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
---
 test/podman_push.bats | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'test/podman_push.bats')

diff --git a/test/podman_push.bats b/test/podman_push.bats
index 82798b3fc..8308f4e83 100644
--- a/test/podman_push.bats
+++ b/test/podman_push.bats
@@ -36,7 +36,7 @@ function setup() {
     echo "$output"
     [ "$status" -eq 0 ]
     rm -rf /tmp/busybox
-    run bash -c ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
+    run ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
     echo "$output"
     [ "$status" -eq 0 ]
 }
@@ -47,7 +47,7 @@ function setup() {
     echo "--->"
     [ "$status" -eq 0 ]
     rm /tmp/busybox-archive
-    run bash -c ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
+    run ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
     echo "$output"
     [ "$status" -eq 0 ]
 }
@@ -57,18 +57,18 @@ function setup() {
     echo "$output"
     [ "$status" -eq 0 ]
     rm -f /tmp/oci-busybox.tar
-    run bash -c ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
+    run ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "podman push without signatures" {
     mkdir /tmp/busybox
-    run bash -c ${PODMAN_BINARY} $PODMAN_OPTIONS push --remove-signatures $ALPINE dir:/tmp/busybox
+    run ${PODMAN_BINARY} $PODMAN_OPTIONS push --remove-signatures $ALPINE dir:/tmp/busybox
     echo "$output"
     [ "$status" -eq 0 ]
     rm -rf /tmp/busybox
-    run bash -c ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
+    run ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
     echo "$output"
     [ "$status" -eq 0 ]
 }
@@ -86,13 +86,13 @@ function setup() {
 }
 
 @test "push with manifest type conversion" {
-    run bash -c "${PODMAN_BINARY} $PODMAN_OPTIONS push --format oci "${BB}" dir:my-dir"
+    run ${PODMAN_BINARY} $PODMAN_OPTIONS push --format oci "${BB}" dir:my-dir
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "grep "application/vnd.oci.image.config.v1+json" my-dir/manifest.json"
+    run grep "application/vnd.oci.image.config.v1+json" my-dir/manifest.json
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c "${PODMAN_BINARY} $PODMAN_OPTIONS push --compress --format v2s2 "${BB}" dir:my-dir"
+    run ${PODMAN_BINARY} $PODMAN_OPTIONS push --compress --format v2s2 "${BB}" dir:my-dir
     echo "$output"
     [ "$status" -eq 0 ]
     run bash -c "grep "application/vnd.docker.distribution.manifest.v2+json" my-dir/manifest.json"
-- 
cgit v1.2.3-54-g00ecf