Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
- job:
name: system-test-fedora-rawhide
description: Run Toolbox's system tests in Fedora Rawhide
timeout: 3600
timeout: 4800
nodeset:
nodes:
- name: fedora-rawhide
Expand All @@ -62,7 +62,7 @@
- job:
name: system-test-fedora-39
description: Run Toolbx's system tests in Fedora 39
timeout: 2400
timeout: 3000
nodeset:
nodes:
- name: fedora-39
Expand All @@ -73,7 +73,7 @@
- job:
name: system-test-fedora-38
description: Run Toolbx's system tests in Fedora 38
timeout: 2400
timeout: 3000
nodeset:
nodes:
- name: fedora-38
Expand All @@ -84,7 +84,7 @@
- job:
name: system-test-fedora-37
description: Run Toolbx's system tests in Fedora 37
timeout: 2400
timeout: 3000
nodeset:
nodes:
- name: fedora-37
Expand Down
72 changes: 63 additions & 9 deletions test/system/102-list.bats
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,13 @@ teardown() {

assert_success
assert_line --index 1 --partial "$default_image"
assert [ ${#lines[@]} -eq 3 ]

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

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

Expand All @@ -115,7 +121,13 @@ teardown() {

assert_success
assert_line --index 1 --partial "$default_image"
assert [ ${#lines[@]} -eq 3 ]

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

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

Expand Down Expand Up @@ -428,7 +440,13 @@ teardown() {
assert_success
assert_line --index 1 --partial "$default_image"
assert_line --index 2 --partial "$default_image-copy"
assert [ ${#lines[@]} -eq 4 ]

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

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

Expand All @@ -447,7 +465,13 @@ teardown() {
assert_success
assert_line --index 1 --partial "$default_image"
assert_line --index 2 --partial "$default_image-copy"
assert [ ${#lines[@]} -eq 4 ]

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

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

Expand Down Expand Up @@ -477,7 +501,13 @@ teardown() {
assert_success
assert_line --index 1 --partial "registry.fedoraproject.org/fedora-toolbox:34"
assert_line --index 2 --partial "$default_image"
assert [ ${#lines[@]} -eq 4 ]

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
Expand All @@ -487,7 +517,13 @@ teardown() {
assert_line --index 1 --partial "$default_container"
assert_line --index 2 --partial "non-default-one"
assert_line --index 3 --partial "non-default-two"
assert [ ${#lines[@]} -eq 5 ]

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
Expand All @@ -499,7 +535,13 @@ teardown() {
assert_line --index 5 --partial "$default_container"
assert_line --index 6 --partial "non-default-one"
assert_line --index 7 --partial "non-default-two"
assert [ ${#lines[@]} -eq 9 ]

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

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

Expand All @@ -521,7 +563,13 @@ 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"
assert [ ${#lines[@]} -eq 5 ]

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

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

Expand All @@ -539,7 +587,13 @@ 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"
assert [ ${#lines[@]} -eq 5 ]

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

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

Expand Down