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_inspect.bats | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

(limited to 'test/kpod_inspect.bats')

diff --git a/test/kpod_inspect.bats b/test/kpod_inspect.bats
index 3c627ceac..ca7e16aad 100644
--- a/test/kpod_inspect.bats
+++ b/test/kpod_inspect.bats
@@ -2,23 +2,20 @@
 
 load helpers
 
-IMAGE="docker.io/library/busybox:latest"
-
 function teardown() {
     cleanup_test
 }
 
+function setup() {
+    copy_images
+}
+
 @test "kpod inspect image" {
-    ${KPOD_BINARY} $KPOD_OPTIONS pull ${IMAGE}
-    run bash -c "${KPOD_BINARY} $KPOD_OPTIONS inspect ${IMAGE} | python -m json.tool"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi ${IMAGE}
+    run bash -c "${KPOD_BINARY} $KPOD_OPTIONS inspect ${ALPINE} | python -m json.tool"
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
-
 @test "kpod inspect non-existent container" {
     run ${KPOD_BINARY} $KPOD_OPTIONS inspect 14rcole/non-existent
     echo "$output"
@@ -26,27 +23,20 @@ function teardown() {
 }
 
 @test "kpod inspect with format" {
-    ${KPOD_BINARY} $KPOD_OPTIONS pull ${IMAGE}
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS inspect --format {{.ID}} ${IMAGE}
+    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS inspect --format {{.ID}} ${ALPINE}
     echo "$output"
     [ "$status" -eq 0 ]
     inspectOutput="$output"
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS images --no-trunc --quiet ${IMAGE}
+    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS images --no-trunc --quiet ${ALPINE}
     echo "$output"
     [ "$status" -eq 0 ]
     [ "$output" = "$inspectOutput" ]
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi ${IMAGE}
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "kpod inspect specified type" {
-    ${KPOD_BINARY} $KPOD_OPTIONS pull ${IMAGE}
-    run bash -c "${KPOD_BINARY} $KPOD_OPTIONS inspect --type image ${IMAGE} | python -m json.tool"
-    echo "$output"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi ${IMAGE}
+    run bash -c "${KPOD_BINARY} $KPOD_OPTIONS inspect --type image ${ALPINE} | python -m json.tool"
     echo "$output"
     [ "$status" -eq 0 ]
 }
-- 
cgit v1.2.3-54-g00ecf