test/system: Simplify the line count checks by relying on Bats >= 1.10.0
Fedoras 37 and 38 didn't have Bats 1.10.0. However, they reached End of Life on 15th November 2023 and 21st May 2024 respectively, and were dropped from the CI [1,2]. Fedora 39 is the oldest supported Fedora and it has Bats 1.10.0. Therefore, there's no need to retain compatibility with Bats < 1.10.0. [1] Commit9c2b5e9a4bhttps://github.com/containers/toolbox/pull/1418 [2] Commitb684b190d1https://github.com/containers/toolbox/pull/1527 https://github.com/containers/toolbox/pull/1532
This commit is contained in:
Debarshi Ray
parent
c8c9e95ed0
commit
87eaeea6f0
|
|
@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
|
|||
load 'libs/helpers.bash'
|
||||
|
||||
setup() {
|
||||
bats_require_minimum_version 1.10.0
|
||||
_setup_environment
|
||||
cleanup_all
|
||||
}
|
||||
|
|
@ -104,12 +105,7 @@ teardown() {
|
|||
assert_line --index 4 "enter Enter an existing Toolbx container"
|
||||
assert_line --index 5 "list List all existing Toolbx containers and images"
|
||||
assert_line --index 7 "Go to https://github.com/containers/toolbox for further information."
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 8 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 9 ]
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2154
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ load 'libs/bats-assert/load'
|
|||
load 'libs/helpers'
|
||||
|
||||
setup() {
|
||||
bats_require_minimum_version 1.7.0
|
||||
bats_require_minimum_version 1.10.0
|
||||
_setup_environment
|
||||
cleanup_all
|
||||
}
|
||||
|
|
@ -234,13 +234,7 @@ teardown() {
|
|||
assert_success
|
||||
assert_line --index 0 "Created container: $image"
|
||||
assert_line --index 1 "Enter with: toolbox enter $image"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
|
||||
run $PODMAN ps --all
|
||||
|
|
@ -257,13 +251,7 @@ teardown() {
|
|||
assert_success
|
||||
assert_line --index 0 "Created container: non-default"
|
||||
assert_line --index 1 "Enter with: toolbox enter non-default"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
|
||||
run $PODMAN ps --all
|
||||
|
|
@ -280,13 +268,7 @@ teardown() {
|
|||
assert_success
|
||||
assert_line --index 0 "Created container: non-default"
|
||||
assert_line --index 1 "Enter with: toolbox enter non-default"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
|
||||
run $PODMAN ps --all
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ load 'libs/bats-assert/load'
|
|||
load 'libs/helpers'
|
||||
|
||||
setup() {
|
||||
bats_require_minimum_version 1.7.0
|
||||
bats_require_minimum_version 1.10.0
|
||||
_setup_environment
|
||||
cleanup_all
|
||||
}
|
||||
|
|
@ -97,13 +97,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "$default_image"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -121,13 +115,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "$default_image"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -142,13 +130,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "quay.io/toolbx/arch-toolbox:latest"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -163,13 +145,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "quay.io/toolbx/arch-toolbox:latest"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -184,13 +160,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "registry.fedoraproject.org/fedora-toolbox:34"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -205,13 +175,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "registry.fedoraproject.org/fedora-toolbox:34"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -226,13 +190,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "registry.access.redhat.com/ubi8/toolbox:8.10"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -247,13 +205,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "registry.access.redhat.com/ubi8/toolbox:8.10"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -268,13 +220,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:16.04"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -289,13 +235,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:16.04"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -310,13 +250,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:18.04"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -331,13 +265,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:18.04"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -352,13 +280,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:20.04"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -373,13 +295,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:20.04"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -394,13 +310,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "<none>"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -415,13 +325,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 1 --partial "<none>"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -440,13 +344,7 @@ teardown() {
|
|||
assert_success
|
||||
assert_line --index 1 --partial "$default_image"
|
||||
assert_line --index 2 --partial "$default_image-copy"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 4 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -465,13 +363,7 @@ teardown() {
|
|||
assert_success
|
||||
assert_line --index 1 --partial "$default_image"
|
||||
assert_line --index 2 --partial "$default_image-copy"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 4 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -501,13 +393,7 @@ teardown() {
|
|||
assert_success
|
||||
assert_line --index 1 --partial "registry.fedoraproject.org/fedora-toolbox:34"
|
||||
assert_line --index 2 --partial "$default_image"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 3 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 4 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
|
||||
# Check containers
|
||||
|
|
@ -517,13 +403,7 @@ teardown() {
|
|||
assert_line --index 1 --partial "$default_container"
|
||||
assert_line --index 2 --partial "non-default-one"
|
||||
assert_line --index 3 --partial "non-default-two"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 4 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 5 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
|
||||
# Check all together
|
||||
|
|
@ -535,13 +415,7 @@ teardown() {
|
|||
assert_line --index 5 --partial "$default_container"
|
||||
assert_line --index 6 --partial "non-default-one"
|
||||
assert_line --index 7 --partial "non-default-two"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 8 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 9 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -563,13 +437,7 @@ teardown() {
|
|||
assert_line --index 1 --partial "<none>"
|
||||
assert_line --index 2 --partial "registry.fedoraproject.org/fedora-toolbox:34"
|
||||
assert_line --index 3 --partial "$default_image"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 4 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 5 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
@ -587,13 +455,7 @@ teardown() {
|
|||
assert_line --index 1 --partial "<none>"
|
||||
assert_line --index 2 --partial "registry.fedoraproject.org/fedora-toolbox:34"
|
||||
assert_line --index 3 --partial "$default_image"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 4 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 5 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -207,13 +207,7 @@ teardown() {
|
|||
|
||||
assert_success
|
||||
assert_line --index 0 "uid=0(root) gid=0(root) groups=0(root)"
|
||||
|
||||
if check_bats_version 1.10.0; then
|
||||
assert [ ${#lines[@]} -eq 1 ]
|
||||
else
|
||||
assert [ ${#lines[@]} -eq 2 ]
|
||||
fi
|
||||
|
||||
assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue