vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Correct our usage of the bats run helper

Browse source 
The bats "run" helper function sets "$status", so there's no point to
checking the value of "$status" when we haven't used the "run" helper to
run a command, and we almost always want to be checking the value after
we have used the helper.

There's no need to run commands like 'sleep' or 'rm -f' with the helper,
since they're not expected to fail, and if they do, it's probably
indicative of a larger problem that we want to allow to cause tests to
fail.

Helper functions like start_crio already check "$status" when they call
"run", so we don't need to check it again after they return.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2017-09-28 13:46:07 -04:00
parent a88f6840d8
commit ddb8fb30cc
11 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/kpod_ps.bats
View file

@ -167,12 +167,10 @@ IMAGE="redis:alpine"
cleanup_ctrs
cleanup_pods
stop_crio
[ "$status" -eq 0 ]
}
@test "kpod ps namespace flag" {
start_crio
[ "$status" -eq 0 ]
run crioctl pod run --config "$TESTDATA"/sandbox_config.json
echo "$output"
[ "$status" -eq 0 ]
@ -215,7 +213,6 @@ IMAGE="redis:alpine"
@test "kpod ps without namespace flag and format flag = json" {
start_crio
[ "$status" -eq 0 ]
run crioctl pod run --config "$TESTDATA"/sandbox_config.json
echo "$output"
[ "$status" -eq 0 ]
@ -231,7 +228,6 @@ IMAGE="redis:alpine"
cleanup_ctrs
cleanup_pods
stop_crio
[ "$status" -eq 0 ]
}
@test "kpod ps format flag = go template" {