From 40dce698d3359a6bf89ed954a483454daf2e9fb2 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Wed, 22 Nov 2017 10:46:47 -0500 Subject: Update kpod mount and umount to use the new state The new state for containers has been added moved kpod mount and umount over to use it Signed-off-by: Urvashi Mohnani Closes: #57 Approved by: rhatdan --- test/kpod_mount.bats | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'test/kpod_mount.bats') diff --git a/test/kpod_mount.bats b/test/kpod_mount.bats index 48f581505..35f707451 100644 --- a/test/kpod_mount.bats +++ b/test/kpod_mount.bats @@ -13,41 +13,29 @@ function setup() { } @test "mount" { - 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" - echo "$output" - [ "$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} mount $ctr_id + run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} mount $ctr_id" echo "$output" - echo ${KPOD_BINARY} ${KPOD_OPTIONS} mount $ctr_id [ "$status" -eq 0 ] run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} mount --notruncate | grep $ctr_id" echo "$output" [ "$status" -eq 0 ] - run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} unmount $ctr_id + run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} unmount $ctr_id" echo "$output" [ "$status" -eq 0 ] - run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} mount $ctr_id + run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} mount $ctr_id" echo "$output" [ "$status" -eq 0 ] - root="$output" run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} mount --format=json | python -m json.tool | grep $ctr_id" echo "$output" [ "$status" -eq 0 ] - touch $root/foobar - run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} unmount $ctr_id + run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} unmount $ctr_id" + echo "$output" + [ "$status" -eq 0 ] + run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm $ctr_id" echo "$output" [ "$status" -eq 0 ] - cleanup_ctrs - cleanup_pods - stop_crio } -- cgit v1.2.3-54-g00ecf