Don't pull cached images

In our tests, each test instance is already seeded with images.  In that case,
we do not need to pull down an image that is already seeded.

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

Closes: #191
Approved by: baude

1 files changed, 6 insertions, 17 deletions

diff --git a/test/podman_images.bats b/test/podman_images.bats
index b500f6b98..3ea8af793 100644
--- a/test/podman_images.bats
+++ b/test/podman_images.bats
@@ -2,43 +2,32 @@
 
 load helpers
 
-IMAGE="busybox"
-
 function teardown() {
     cleanup_test
 }
 
+function setup() {
+    copy_images
+}
 @test "podman images" {
-    run bash -c ${PODMAN_BINARY} ${PODMAN_OPTIONS} pull ${IMAGE}
-    echo "$output"
-    [ "$status" -eq 0 ]
     run bash -c ${PODMAN_BINARY} ${PODMAN_OPTIONS} images
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c ${PODMAN_BINARY} ${PODMAN_OPTIONS} rmi ${IMAGE}
-    echo "$output"
-    [ "$status" -eq 0 ]
 }
 
 @test "podman images test valid json" {
-    ${PODMAN_BINARY} ${PODMAN_OPTIONS} pull ${IMAGE}
     run ${PODMAN_BINARY} ${PODMAN_OPTIONS} images --format json
     echo "$output" | python -m json.tool
     [ "$status" -eq 0 ]
-    run bash -c ${PODMAN_BINARY} ${PODMAN_OPTIONS} rmi ${IMAGE}
-    echo "$output"
-    [ "$status" -eq 0 ]
 }
 
 @test "podman images check name json output" {
-    ${PODMAN_BINARY} ${PODMAN_OPTIONS} pull ${IMAGE}
+    ${PODMAN_BINARY} ${PODMAN_OPTIONS} rmi -fa
+    ${PODMAN_BINARY} ${PODMAN_OPTIONS} pull ${ALPINE}
     run  ${PODMAN_BINARY} ${PODMAN_OPTIONS} images --format json
     [ "$status" -eq 0 ]
     name=$(echo $output | python -c 'import sys; import json; print(json.loads(sys.stdin.read())[0])["names"][0]')
-    [ "$name" == "docker.io/library/${IMAGE}:latest" ]
-    run bash -c ${PODMAN_BINARY} ${PODMAN_OPTIONS} rmi ${IMAGE}
-    echo "$output"
-    [ "$status" -eq 0 ]
+    [ "$name" == "docker.io/library/alpine:latest" ]
 }
 
 @test "podman images short options" {