From 178c1e9ccb2965c6edad72edd4753a76babc3161 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Thu, 17 Aug 2017 12:45:08 -0400 Subject: [PATCH] kpod.bats: correct syntax errors Correct some syntax errors in kpod.bats, ensure that it always checks the exit status of "kpod rmi" commands, correct the order of options when calling "kpod inspect", and test for string equality correctly. Signed-off-by: Nalin Dahyabhai --- test/kpod.bats | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/kpod.bats b/test/kpod.bats index fd83e774..b851cf24 100644 --- a/test/kpod.bats +++ b/test/kpod.bats @@ -198,8 +198,9 @@ function teardown() { run bash -c "${KPOD_BINARY} $KPOD_OPTIONS inspect redis:alpine | python -m json.tool" echo "$output" [ "$status" -eq 0 ] -} run ${KPOD_BINARY} $KPOD_OPTIONS rmi redis:alpine + [ "$status" -eq 0 ] +} @test "kpod inspect non-existent container" { @@ -211,13 +212,14 @@ function teardown() { @test "kpod inspect with format" { run ${KPOD_BINARY} $KPOD_OPTIONS pull redis:alpine [ "$status" -eq 0 ] - run ${KPOD_BINARY} $KPOD_OPTIONS --format {{.ID}} inspect redis:alpine - [ "$status" -eq 0] + run ${KPOD_BINARY} $KPOD_OPTIONS inspect --format {{.ID}} redis:alpine + [ "$status" -eq 0 ] inspectOutput="$output" run ${KPOD_BINARY} $KPOD_OPTIONS images --quiet redis:alpine - [ "$status" -eq 0] - [ "$output" -eq "$inspectOutput" ] + [ "$status" -eq 0 ] + [ "$output" = "$inspectOutput" ] run ${KPOD_BINARY} $KPOD_OPTIONS rmi redis:alpine + [ "$status" -eq 0 ] } @test "kpod inspect specified type" { @@ -225,8 +227,9 @@ function teardown() { [ "$status" -eq 0 ] run bash -c "${KPOD_BINARY} $KPOD_OPTIONS inspect --type image redis:alpine | python -m json.tool" echo "$output" - [ "$status" -eq 0] + [ "$status" -eq 0 ] run ${KPOD_BINARY} $KPOD_OPTIONS rmi redis:alpine + [ "$status" -eq 0 ] } @test "kpod images" { @@ -245,6 +248,7 @@ function teardown() { @test "kpod images check name json output" { run ${KPOD_BINARY} $KPOD_OPTIONS pull debian:6.0.10 run ${KPOD_BINARY} $KPOD_OPTIONS images --format json + echo "$output" name=$(echo $output | python -c 'import sys; import json; print(json.loads(sys.stdin.read())[0])["names"][0]') - [ "$name" == "docker.io/library/debian:6.0.10" ] + [ "$name" = "docker.io/library/debian:6.0.10" ] }