1 files changed, 31 insertions, 102 deletions
diff --git a/test/kpod_pause.bats b/test/kpod_pause.bats
index 0cd22f469..23c27ae71 100644
--- a/test/kpod_pause.bats
+++ b/test/kpod_pause.bats
@@ -2,8 +2,6 @@
 
 load helpers
 
-IMAGE="redis:alpine"
-
 function setup() {
     copy_images
 }
@@ -13,166 +11,97 @@ function teardown() {
 }
 
 @test "pause a bogus container" {
-    run ${KPOD_BINARY} ${KPOD_OPTIONS} pause foobar
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} pause foobar"
     echo "$output"
     [ "$status" -eq 1 ]
 }
 
 @test "unpause a bogus container" {
-    run ${KPOD_BINARY} ${KPOD_OPTIONS} unpause foobar
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} unpause foobar"
     echo "$output"
     [ "$status" -eq 1 ]
 }
 
 @test "pause a created container by id" {
-    skip "Test needs to be converted to kpod run"
-    start_crio
-    run crioctl pod run --config "$TESTDATA"/sandbox_config.json
-    echo "$output"
-    [ "$status" -eq 0 ]
-    pod_id="$output"
-    run crioctl image pull "$IMAGE"
-    [ "$status" -eq 0 ]
-    run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} create $BB ls"
     echo "$output"
     [ "$status" -eq 0 ]
     ctr_id="$output"
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} pause "$ctr_id"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} unpause "$ctr_id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} pause $ctr_id"
     echo "$output"
-    [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter id="$ctr_id"
+    [ "$status" -eq 1 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm $ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    cleanup_pods
-    stop_crio
 }
 
 @test "pause a running container by id" {
-    skip "Test needs to be converted to kpod run"
-    start_crio
-    run crioctl pod run --config "$TESTDATA"/sandbox_config.json
-    echo "$output"
-    [ "$status" -eq 0 ]
-    pod_id="$output"
-    run crioctl image pull "$IMAGE"
-    [ "$status" -eq 0 ]
-    run crioctl ctr create --config "$TESTDATA"/container_redis.json --pod "$pod_id"
+    skip "Test needs to wait for --force to work for kpod rm"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d $BB sleep 60"
     echo "$output"
     [ "$status" -eq 0 ]
     ctr_id="$output"
-    run crioctl ctr start --id "$ctr_id"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    id="$output"
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} pause "$id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} pause $ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} unpause "$id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} unpause $ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter id="$ctr_id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f $ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    cleanup_pods
-    stop_crio
 }
 
-@test "pause a running container by name" {
-    skip "Test needs to be converted to kpod run"
-    start_crio
-    run crioctl pod run --config "$TESTDATA"/sandbox_config.json
-    echo "$output"
-    [ "$status" -eq 0 ]
-    pod_id="$output"
-    run crioctl image pull "$IMAGE"
-    [ "$status" -eq 0 ]
-    run crioctl ctr create --config "$TESTDATA"/container_redis.json --pod "$pod_id"
+@test "unpause a running container" {
+    skip "Test needs to wait for --force to work for kpod rm"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d $BB sleep 60"
     echo "$output"
     [ "$status" -eq 0 ]
     ctr_id="$output"
-    run crioctl ctr start --id "$ctr_id"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} pause "k8s_podsandbox1-redis_podsandbox1_redhat.test.crio_redhat-test-crio_0"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} unpause "k8s_podsandbox1-redis_podsandbox1_redhat.test.crio_redhat-test-crio_0"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} unpause $ctr_id"
     echo "$output"
-    [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter id="k8s_podsandbox1-redis_podsandbox1_redhat.test.crio_redhat-test-crio_0"
+    [ "$status" -eq 1 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f $ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    cleanup_pods
-    stop_crio
 }
 
 @test "remove a paused container by id" {
-    skip "Test needs to be converted to kpod run"
-    start_crio
-    run crioctl pod run --config "$TESTDATA"/sandbox_config.json
-    echo "$output"
-    [ "$status" -eq 0 ]
-    pod_id="$output"
-    run crioctl image pull "$IMAGE"
-    [ "$status" -eq 0 ]
-    run crioctl ctr create --config "$TESTDATA"/container_redis.json --pod "$pod_id"
+    skip "Test needs to wait for --force to work for kpod rm"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d $BB sleep 60"
     echo "$output"
     [ "$status" -eq 0 ]
     ctr_id="$output"
-    run crioctl ctr start --id "$ctr_id"
-    echo "$output"
-    id="$output"
-    [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} pause "$id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} pause $ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} rm "$id"
-    echo "$output"
-    [ "$status" -eq 1 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} rm --force "$id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm $ctr_id"
     echo "$output"
     [ "$status" -eq 1 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} unpause "$id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm --force $ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} stop "$ctr_id"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} rm "$ctr_id"
-    echo "$output"
-    [ "$status" -eq 0 ]
-    cleanup_pods
-    stop_crio
 }
 
 @test "stop a paused container created by id" {
-    skip "Test needs to be converted to kpod run"
-    start_crio
-    run crioctl pod run --config "$TESTDATA"/sandbox_config.json
-    echo "$output"
-    [ "$status" -eq 0 ]
-    pod_id="$output"
-    run crioctl image pull "$IMAGE"
-    [ "$status" -eq 0 ]
-    run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id"
+    skip "Test needs to wait for kpod stop to be implemented"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d $BB sleep 60"
     echo "$output"
     [ "$status" -eq 0 ]
     ctr_id="$output"
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} pause "$ctr_id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} pause $ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} stop "$ctr_id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} stop $ctr_id"
     echo "$output"
     [ "$status" -eq 1 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} unpause "$ctr_id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} unpause $ctr_id"
+    echo "$output"
+    [ "$status" -eq 0 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter id=$ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter id="$ctr_id"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm $ctr_id"
     echo "$output"
     [ "$status" -eq 0 ]
-    cleanup_pods
-    stop_crio
 }