Update container-based tests

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #68
Approved by: rhatdan

1 files changed, 34 insertions, 60 deletions

diff --git a/test/kpod_kill.bats b/test/kpod_kill.bats
index b267fc9df..c0f01e8b4 100644
--- a/test/kpod_kill.bats
+++ b/test/kpod_kill.bats
@@ -3,6 +3,7 @@
 load helpers
 
 function teardown() {
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f `${KPOD_BINARY} ${KPOD_OPTIONS} ps -a -q`"
     cleanup_test
 }
 
@@ -10,82 +11,55 @@ function setup() {
     copy_images
 }
 
-function start_sleep_container () {
-    pod_id=$(crioctl pod run --config "$TESTDATA"/sandbox_config.json)
-    ctr_id=$(crioctl ctr create --config "$TESTDATA"/container_config_sleep.json --pod "$pod_id")
-    crioctl ctr start --id "$ctr_id"
-}
-
 @test "kill a bogus container" {
-    run ${KPOD_BINARY} ${KPOD_OPTIONS} kill foobar
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} kill foobar"
     echo "$output"
     [ "$status" -ne 0 ]
 }
 
 @test "kill a running container by id" {
-    skip "Test needs to be converted to kpod run"
-    start_crio
-    ${KPOD_BINARY} ${KPOD_OPTIONS} pull docker.io/library/busybox:latest
-    ctr_id=$( start_sleep_container )
-    crioctl ctr status --id "$ctr_id"
-    ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a
-    ${KPOD_BINARY} ${KPOD_OPTIONS} logs "$ctr_id"
-    crioctl ctr status --id "$ctr_id"
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} kill "$ctr_id"
-    echo "$output"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 9999"
+    [ "$status" -eq 0 ]
+    ctr_id="$output"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps"
+    [ "$status" -eq 0 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} kill $ctr_id"
+    [ "$status" -eq 0 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps"
     [ "$status" -eq 0 ]
-    cleanup_ctrs
-    cleanup_pods
-    stop_crio
 }
 
 @test "kill a running container by id with TERM" {
-    skip "Test needs to be converted to kpod run"
-    start_crio
-    ${KPOD_BINARY} ${KPOD_OPTIONS} pull docker.io/library/busybox:latest
-    ctr_id=$( start_sleep_container )
-    crioctl ctr status --id "$ctr_id"
-    ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a
-    ${KPOD_BINARY} ${KPOD_OPTIONS} logs "$ctr_id"
-    crioctl ctr status --id "$ctr_id"
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} kill -s TERM "$ctr_id"
-    echo "$output"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 9999"
+    [ "$status" -eq 0 ]
+    ctr_id="$output"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps"
+    [ "$status" -eq 0 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} kill -s TERM $ctr_id"
+    [ "$status" -eq 0 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps --no-trunc"
     [ "$status" -eq 0 ]
-    cleanup_ctrs
-    cleanup_pods
-    stop_crio
 }
 
 @test "kill a running container by name" {
-    skip "Test needs to be converted to kpod run"
-    start_crio
-    ${KPOD_BINARY} ${KPOD_OPTIONS} pull docker.io/library/busybox:latest
-    ctr_id=$( start_sleep_container )
-    crioctl ctr status --id "$ctr_id"
-    ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a
-    ${KPOD_BINARY} ${KPOD_OPTIONS} logs "$ctr_id"
-    crioctl ctr status --id "$ctr_id"
-    ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} kill "k8s_container999_podsandbox1_redhat.test.crio_redhat-test-crio_1"
-    echo "$output"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run --name test1 -d ${ALPINE} sleep 9999"
+    [ "$status" -eq 0 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps"
+    [ "$status" -eq 0 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} kill -s TERM test1"
+    [ "$status" -eq 0 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps --no-trunc"
     [ "$status" -eq 0 ]
-    cleanup_ctrs
-    cleanup_pods
-    stop_crio
 }
 
 @test "kill a running container by id with a bogus signal" {
-    skip "Test needs to be converted to kpod run"
-    start_crio
-    ${KPOD_BINARY} ${KPOD_OPTIONS} pull docker.io/library/busybox:latest
-    ctr_id=$( start_sleep_container )
-    crioctl ctr status --id "$ctr_id"
-    ${KPOD_BINARY} ${KPOD_OPTIONS} logs "$ctr_id"
-    crioctl ctr status --id "$ctr_id"
-    run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} kill -s foobar "$ctr_id"
-    echo "$output"
-    [ "$status" -ne 0 ]
-    cleanup_ctrs
-    cleanup_pods
-    stop_crio
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 9999"
+    [ "$status" -eq 0 ]
+    ctr_id="$output"
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps"
+    [ "$status" -eq 0 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} kill -s foobar $ctr_id"
+    [ "$status" -eq 1 ]
+    run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps --no-trunc"
+    [ "$status" -eq 0 ]
 }