Skip to content

.zuul, test/system: Simplify line count checks by using Bats >= 1.10.0 #1546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
debarshiray merged 1 commit into from
Sep 19, 2024
Merged

.zuul, test/system: Simplify line count checks by using Bats >= 1.10.0 #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .zuul.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
- job:
name: system-test-fedora-40
description: Run Toolbx's system tests in Fedora 40
timeout: 6600
timeout: 7200
nodeset:
nodes:
- name: fedora-40
Expand All @@ -73,7 +73,7 @@
- job:
name: system-test-fedora-39
description: Run Toolbx's system tests in Fedora 39
timeout: 6600
timeout: 7200
nodeset:
nodes:
- name: fedora-39
Expand Down
18 changes: 3 additions & 15 deletions test/system/230-cdi.bats
View file
Open in desktop
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
pushd "$HOME" || return 1
Expand Down Expand Up @@ -128,13 +128,7 @@ teardown() {
assert_line --index 1 "# https://containertoolbx.org/"
assert_line --index 2 ""
assert_line --index 3 "/usr/lib64"

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 Expand Up @@ -168,13 +162,7 @@ teardown() {
assert_line --index 2 ""
assert_line --index 3 "/usr/lib"
assert_line --index 4 "/usr/lib64"

if check_bats_version 1.10.0; then
assert [ ${#lines[@]} -eq 5 ]
else
assert [ ${#lines[@]} -eq 6 ]
fi

assert [ ${#lines[@]} -eq 5 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

Expand Down