Skip to content

test/system: Consolidate teardown() to remove both containers & images #1526

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
Aug 29, 2024
Merged

test/system: Consolidate teardown() to remove both containers & images #1526

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
6 changes: 3 additions & 3 deletions .zuul.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
- job:
name: system-test-fedora-rawhide
description: Run Toolbx's system tests in Fedora Rawhide
timeout: 4800
timeout: 7800
nodeset:
nodes:
- name: fedora-rawhide
Expand All @@ -62,7 +62,7 @@
- job:
name: system-test-fedora-40
description: Run Toolbx's system tests in Fedora 40
timeout: 3600
timeout: 6600
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: 3600
timeout: 6600
nodeset:
nodes:
- name: fedora-39
Expand Down
2 changes: 1 addition & 1 deletion test/system/101-create.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ load 'libs/helpers'
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_containers
cleanup_all
}

teardown() {
Expand Down
4 changes: 2 additions & 2 deletions test/system/103-container.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ load 'libs/helpers'

setup() {
_setup_environment
cleanup_containers
cleanup_all
}

teardown() {
cleanup_containers
cleanup_all
}


Expand Down
4 changes: 2 additions & 2 deletions test/system/104-run.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ load 'libs/helpers'
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_containers
cleanup_all
pushd "$HOME" || return 1
}

teardown() {
popd || return 1
cleanup_containers
cleanup_all
}

@test "run: Smoke test with true(1)" {
Expand Down
4 changes: 2 additions & 2 deletions test/system/105-enter.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ load 'libs/helpers'

setup() {
_setup_environment
cleanup_containers
cleanup_all
}

teardown() {
cleanup_containers
cleanup_all
}

@test "enter: Try to enter the default container with no containers created" {
Expand Down
4 changes: 2 additions & 2 deletions test/system/106-rm.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ load 'libs/helpers'

setup() {
_setup_environment
cleanup_containers
cleanup_all
}

teardown() {
cleanup_containers
cleanup_all
}


Expand Down
4 changes: 2 additions & 2 deletions test/system/201-ipc.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ load 'libs/helpers'
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_containers
cleanup_all
pushd "$HOME" || return 1
}

teardown() {
popd || return 1
cleanup_containers
cleanup_all
}

@test "ipc: No namespace" {
Expand Down
4 changes: 2 additions & 2 deletions test/system/203-network.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ readonly RESOLVER_SH='resolvectl --legend false --no-pager --type "$0" query "$1
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_containers
cleanup_all
pushd "$HOME" || return 1
}

teardown() {
popd || return 1
cleanup_containers
cleanup_all
}

@test "network: No namespace" {
Expand Down
4 changes: 2 additions & 2 deletions test/system/206-user.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ load 'libs/helpers'
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_containers
cleanup_all
pushd "$HOME" || return 1
}

teardown() {
popd || return 1
cleanup_containers
cleanup_all
}

@test "user: Separate namespace" {
Expand Down
4 changes: 2 additions & 2 deletions test/system/210-ulimit.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ load 'libs/helpers'
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_containers
cleanup_all
pushd "$HOME" || return 1
}

teardown() {
popd || return 1
cleanup_containers
cleanup_all
}

@test "ulimit: real-time non-blocking time (hard)" {
Expand Down
4 changes: 2 additions & 2 deletions test/system/211-dbus.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ load 'libs/helpers'
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_containers
cleanup_all
pushd "$HOME" || return 1
}

teardown() {
popd || return 1
cleanup_containers
cleanup_all
}

@test "dbus: session bus inside the default container" {
Expand Down
4 changes: 2 additions & 2 deletions test/system/220-environment-variables.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ load 'libs/helpers'
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_containers
cleanup_all
pushd "$HOME" || return 1
}

teardown() {
popd || return 1
cleanup_containers
cleanup_all
}

@test "environment variables: HISTFILESIZE inside the default container" {
Expand Down
4 changes: 2 additions & 2 deletions test/system/230-cdi.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ load 'libs/helpers'
setup() {
bats_require_minimum_version 1.7.0
_setup_environment
cleanup_containers
cleanup_all
pushd "$HOME" || return 1
rm --force "$XDG_RUNTIME_DIR/toolbox/cdi-nvidia.json" || return 1
}

teardown() {
rm --force "$XDG_RUNTIME_DIR/toolbox/cdi-nvidia.json" || return 1
popd || return 1
cleanup_containers
cleanup_all
}

@test "cdi: Smoke test" {
Expand Down
5 changes: 0 additions & 5 deletions test/system/libs/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ function cleanup_all() {
}


function cleanup_containers() {
"$PODMAN" rm --all --force >/dev/null
}


function _setup_environment() {
_setup_containers_storage
check_xdg_runtime_dir
Expand Down