Skip to content

Commit

Permalink
test/system: Simplify the line count checks by relying on Bats >= 1.10.0
Browse files Browse the repository at this point in the history 
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] Commit 9c2b5e9
    containers#1418

[2] Commit b684b19
    containers#1527

containers#1532
  • Loading branch information
@debarshiray
debarshiray committed Sep 2, 2024
1 parent c8c9e95 commit f3cee6b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 168 deletions.
8 changes: 2 additions & 6 deletions test/system/002-help.bats
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
assert [ ${#lines[@]} -eq 8 ]

# shellcheck disable=SC2154
assert [ ${#stderr_lines[@]} -eq 0 ]
Expand Down
186 changes: 24 additions & 162 deletions test/system/102-list.bats
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 3 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 3 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand Down Expand Up @@ -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 [ ${#lines[@]} -eq 3 ]
assert [ ${#stderr_lines[@]} -eq 0 ]

# Check containers
Expand All @@ -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 [ ${#lines[@]} -eq 4 ]
assert [ ${#stderr_lines[@]} -eq 0 ]

# Check all together
Expand All @@ -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 [ ${#lines[@]} -eq 8 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 4 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand All @@ -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 [ ${#lines[@]} -eq 4 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand Down

0 comments on commit f3cee6b

Please sign in to comment.