From 3e04604dc2619b1502b609083c3b6ecb0949f1d5 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Tue, 14 Nov 2017 09:50:39 -0600
Subject: Use cached images for integration tests

Add alpine and busybox as the two seeded images that can
be put into the tests' storage without the need to pull
it over the network.  Add the following to the kpod_TEST.bats
file:

function setup() {
    copy_images
}

Also, export several image names for shorter reference:

* BB -> docker.io/library/busybox:latest
* BB_GLIBC -> docker.io/library/busybox:glibc
* ALPINE -> docker.io/library/alpine:latest
* FEDORA_MINIMAL -> registry.fedoraproject.org/fedora-minimal:latest

And finally, there were two pervasive changes I made in
tests:

* Because we use temporary storage, we do not need to rmi at the end of each test
* We no longer need to pull most images because they are added via copy_images

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

Closes: #43
Approved by: mheon
---
 test/kpod_load.bats | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'test/kpod_load.bats')

diff --git a/test/kpod_load.bats b/test/kpod_load.bats
index ab002f04a..7404cb76c 100644
--- a/test/kpod_load.bats
+++ b/test/kpod_load.bats
@@ -2,16 +2,14 @@
 
 load helpers
 
-IMAGE="alpine:latest"
+function setup() {
+    copy_images
+}
 
 function teardown() {
     cleanup_test
 }
-
 @test "kpod load input flag" {
-	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} pull $IMAGE
-	echo "$output"
-	[ "$status" -eq 0 ]
 	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} save -o alpine.tar $IMAGE
 	echo "$output"
 	[ "$status" -eq 0 ]
@@ -22,14 +20,9 @@ function teardown() {
 	echo "$output"
 	[ "$status" -eq 0 ]
 	rm -f alpine.tar
-	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} rmi $IMAGE
-	echo "$output"
-	[ "$status" -eq 0 ]
 }
 
 @test "kpod load oci-archive image" {
-	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} pull $IMAGE
-	[ "$status" -eq 0 ]
 	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} save -o alpine.tar --format oci-archive $IMAGE
 	[ "$status" -eq 0 ]
 	run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $IMAGE
@@ -38,13 +31,9 @@ function teardown() {
 	echo "$output"
 	[ "$status" -eq 0 ]
 	rm -f alpine.tar
-	run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $IMAGE
-	[ "$status" -eq 0 ]
 }
 
 @test "kpod load oci-archive image with signature-policy" {
-	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} pull $IMAGE
-	[ "$status" -eq 0 ]
 	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} save -o alpine.tar --format oci-archive $IMAGE
 	[ "$status" -eq 0 ]
 	run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $IMAGE
@@ -55,14 +44,9 @@ function teardown() {
 	[ "$status" -eq 0 ]
 	rm -f /tmp/policy.json
 	rm -f alpine.tar
-	run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $IMAGE
-	[ "$status" -eq 0 ]
 }
 
 @test "kpod load using quiet flag" {
-	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} pull $IMAGE
-	echo "$output"
-	[ "$status" -eq 0 ]
 	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} save -o alpine.tar $IMAGE
 	echo "$output"
 	[ "$status" -eq 0 ]
@@ -73,8 +57,6 @@ function teardown() {
 	echo "$output"
 	[ "$status" -eq 0 ]
 	rm -f alpine.tar
-	run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} rmi $IMAGE
-	[ "$status" -eq 0 ]
 }
 
 @test "kpod load non-existent file" {
-- 
cgit v1.2.3-54-g00ecf