summaryrefslogtreecommitdiff
path: root/test/kpod_diff.bats
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2017-11-14 09:50:39 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-20 18:11:08 +0000
commit3e04604dc2619b1502b609083c3b6ecb0949f1d5 (patch)
tree34adadd2f86a199bb60bacf57fa8febebe9eb4ab /test/kpod_diff.bats
parent57599f0075ccab859d4158f7ee891b9b971c731f (diff)
downloadpodman-3e04604dc2619b1502b609083c3b6ecb0949f1d5.tar.gz
podman-3e04604dc2619b1502b609083c3b6ecb0949f1d5.tar.bz2
podman-3e04604dc2619b1502b609083c3b6ecb0949f1d5.zip
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
Diffstat (limited to 'test/kpod_diff.bats')
-rw-r--r--test/kpod_diff.bats22
1 files changed, 6 insertions, 16 deletions
diff --git a/test/kpod_diff.bats b/test/kpod_diff.bats
index 826fc7389..d73f462f6 100644
--- a/test/kpod_diff.bats
+++ b/test/kpod_diff.bats
@@ -2,20 +2,16 @@
load helpers
-IMAGE="alpine:latest"
+function setup() {
+ copy_images
+}
function teardown() {
cleanup_test
}
@test "test diff of image and parent" {
- run bash -c ${KPOD_BINARY} $KPOD_OPTIONS pull $IMAGE
- echo "$output"
- [ "$status" -eq 0 ]
- run bash -c ${KPOD_BINARY} $KPOD_OPTIONS diff $IMAGE
- echo "$output"
- [ "$status" -eq 0 ]
- run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $IMAGE
+ run ${KPOD_BINARY} $KPOD_OPTIONS diff $BB
echo "$output"
[ "$status" -eq 0 ]
}
@@ -27,14 +23,8 @@ function teardown() {
}
@test "test diff with json output" {
- run bash -c ${KPOD_BINARY} $KPOD_OPTIONS pull $IMAGE
- echo "$output"
- [ "$status" -eq 0 ]
- # run bash -c bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} diff --format json $IMAGE | python -m json.tool"
- run bash -c ${KPOD_BINARY} $KPOD_OPTIONS diff --format json $IMAGE
- echo "$output"
- [ "$status" -eq 0 ]
- run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $IMAGE
+ # run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} diff --format json $IMAGE | python -m json.tool"
+ run ${KPOD_BINARY} $KPOD_OPTIONS diff --format json $BB
echo "$output"
[ "$status" -eq 0 ]
}