From 3c044f9267f62b8f7f88c7395ad325df3bf420f5 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Tue, 30 Jan 2018 13:19:01 -0600
Subject: Ginkgo Tests: ps, pull, push and rm

Migrate ps, pull, push, and rm from bats to ginkgo.

Also, fixed a conditional issue with adding ports
when an image defines the port and the user wants
to override it.

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

Closes: #277
Approved by: baude
---
 test/podman_push.bats | 102 --------------------------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 test/podman_push.bats

(limited to 'test/podman_push.bats')

diff --git a/test/podman_push.bats b/test/podman_push.bats
deleted file mode 100644
index 8308f4e83..000000000
--- a/test/podman_push.bats
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env bats
-
-load helpers
-
-function teardown() {
-    cleanup_test
-}
-
-function setup() {
-    copy_images
-}
-
-@test "podman push to containers/storage" {
-    skip "Issues with bash, skipping"
-    echo # Push the image right back into storage: it now has two names.
-    run bash -c ${PODMAN_BINARY} $PODMAN_OPTIONS --log-level=debug push $ALPINE containers-storage:busybox:test
-    echo "$output"
-    [ "$status" -eq 0 ]
-    echo # Try to remove it using the first name.  Should be refused.
-    run bash -c ${PODMAN_BINARY} $PODMAN_OPTIONS --log-level=debug rmi $ALPINE
-    echo "$output"
-    [ "$status" -ne 0 ]
-    echo # Try to remove it using the second name.  Should also be refused.
-    run bash -c ${PODMAN_BINARY} $PODMAN_OPTIONS --log-level=debug rmi busybox:test
-    echo "$output"
-    [ "$status" -ne 0 ]
-    echo # Force removal despite having multiple names.  Should succeed.
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS --log-level=debug rmi -f busybox:test
-    echo "$output"
-    [ "$status" -eq 0 ]
-}
-
-@test "podman push to directory" {
-    mkdir /tmp/busybox
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS push $ALPINE dir:/tmp/busybox
-    echo "$output"
-    [ "$status" -eq 0 ]
-    rm -rf /tmp/busybox
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
-    echo "$output"
-    [ "$status" -eq 0 ]
-}
-
-@test "podman push to docker archive" {
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS push $ALPINE docker-archive:/tmp/busybox-archive:1.26
-    echo "$output"
-    echo "--->"
-    [ "$status" -eq 0 ]
-    rm /tmp/busybox-archive
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
-    echo "$output"
-    [ "$status" -eq 0 ]
-}
-
-@test "podman push to oci-archive without compression" {
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS push $ALPINE oci-archive:/tmp/oci-busybox.tar:alpine
-    echo "$output"
-    [ "$status" -eq 0 ]
-    rm -f /tmp/oci-busybox.tar
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
-    echo "$output"
-    [ "$status" -eq 0 ]
-}
-
-@test "podman push without signatures" {
-    mkdir /tmp/busybox
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS push --remove-signatures $ALPINE dir:/tmp/busybox
-    echo "$output"
-    [ "$status" -eq 0 ]
-    rm -rf /tmp/busybox
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS rmi $ALPINE
-    echo "$output"
-    [ "$status" -eq 0 ]
-}
-
-@test "podman push without transport" {
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS pull "$ALPINE"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    # TODO: The following should fail until a registry is running in Travis CI.
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS push "$ALPINE" localhost:5000/my-alpine
-    echo "$output"
-    [ "$status" -ne 0 ]
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS rmi "$ALPINE"
-    echo "$output"
-}
-
-@test "push with manifest type conversion" {
-    run ${PODMAN_BINARY} $PODMAN_OPTIONS push --format oci "${BB}" dir:my-dir
-    echo "$output"
-    [ "$status" -eq 0 ]
-    run grep "application/vnd.oci.image.config.v1+json" my-dir/manifest.json
-    echo "$output"
-    [ "$status" -eq 0 ]
-    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"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    rm -rf my-dir
-}
-- 
cgit v1.2.3-54-g00ecf