Correct our usage of the bats run helper
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:
parent
a88f6840d8
commit
ddb8fb30cc
11 changed files with 17 additions and 13 deletions
|
@ -121,10 +121,8 @@ function teardown() {
|
|||
ctr2_id="$output"
|
||||
|
||||
ping_pod_from_pod $ctr1_id $ctr2_id
|
||||
[ "$status" -eq 0 ]
|
||||
|
||||
ping_pod_from_pod $ctr2_id $ctr1_id
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
@test "Ensure correct CNI plugin namespace/name/container-id arguments" {
|
||||
|
@ -165,6 +163,7 @@ function teardown() {
|
|||
[ "$status" -eq 0 ]
|
||||
run crioctl ctr stop --id "$ctr_id"
|
||||
echo "$output"
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
@test "Clean up network if pod sandbox fails" {
|
||||
|
@ -174,6 +173,8 @@ function teardown() {
|
|||
# networking has been configured
|
||||
chmod 0644 /go/src/github.com/kubernetes-incubator/cri-o/conmon/conmon
|
||||
run crioctl pod run --config "$TESTDATA"/sandbox_config.json
|
||||
echo "$output"
|
||||
[ "$status" -ne 0 ]
|
||||
chmod 0755 /go/src/github.com/kubernetes-incubator/cri-o/conmon/conmon
|
||||
|
||||
# ensure that the server cleaned up sandbox networking if the sandbox
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue