wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/system: Simplify the line count checks by relying on Bats >= 1.7.0

Browse source 
Commit e22a82fec8 already added a dependency on Bats >= 1.7.0,
which is present on Fedora >= 36.  Therefore, it should be exploited
wherever possible to simplify things.

Earlier, when the line counts were checked only with Bats >= 1.7.0,
there was a need to separately check the whole standard error and
output streams with 'assert_output' for the tests to be useful on
Fedora 35, which only had Bats 1.5.0.  Now that the line counts are
being checked unconditionally, there's no need for that anymore.

Note that bats_require_minimum_version itself is only available from
Bats 1.7.0 [1].

[1] Bats commit 71d6b71cebc3d32b
    https://github.com/bats-core/bats-core/issues/556
    https://bats-core.readthedocs.io/en/stable/warnings/BW02.html

https://github.com/containers/toolbox/pull/1314
This commit is contained in:
Debarshi Ray 2023-06-13 12:19:25 +02:00
parent 0676eb98ea
commit bc067f12d6
1 changed files with 21 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
test/system/107-rmi.bats
View file

@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
load 'libs/helpers'
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_all
}
@ -37,13 +38,8 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi --all
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
num_of_images="$(list_images)"
assert_equal "$num_of_images" 0
@ -81,13 +77,8 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image"
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
num_of_images="$(list_images)"
assert_equal "$num_of_images" 0
@ -106,13 +97,8 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi --all
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
num_of_images="$(list_images)"
assert_equal "$num_of_images" 0
@ -131,13 +117,8 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$image"
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
num_of_images="$(list_images)"
assert_equal "$num_of_images" 0
@ -159,24 +140,14 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image"
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image-copy"
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
num_of_images="$(list_images)"
assert_equal "$num_of_images" 0
@ -198,24 +169,14 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image-copy"
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image"
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
num_of_images="$(list_images)"
assert_equal "$num_of_images" 0
@ -237,13 +198,8 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image" "$default_image-copy"
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
num_of_images="$(list_images)"
assert_equal "$num_of_images" 0
@ -265,13 +221,8 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image-copy" "$default_image"
assert_success
assert_output ""
output="$stderr"
assert_output ""
if check_bats_version 1.7.0; then
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
fi
assert [ ${#lines[@]} -eq 0 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
num_of_images="$(list_images)"
assert_equal "$num_of_images" 0