Thanks to visit codestin.com
Credit goes to github.com

Skip to content

test: config tests should ignore default runtime environment variable #6280

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
openshift-merge-bot merged 1 commit into from
Jul 25, 2024
Merged

test: config tests should ignore default runtime environment variable #6280

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
1 change: 0 additions & 1 deletion contrib/test/ci/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
state: present
loop: "{{ ['cgroups.bats'] | product(kata_skip_cgroups_tests) \
+ ['command.bats'] | product(kata_skip_command_tests) \
+ ['config.bats'] | product(kata_skip_config_tests) \
+ ['reload_config.bats'] | product(kata_skip_reload_config) \
+ ['crio-wipe.bats'] | product(kata_skip_crio_wipe_tests) \
+ ['ctr.bats'] | product(kata_skip_ctr_tests) \
Expand Down
4 changes: 0 additions & 4 deletions contrib/test/ci/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@ kata_skip_cgroups_tests:
kata_skip_command_tests:
- 'test "crio commands"'
- 'test "log max boundary testing"'
kata_skip_config_tests:
- 'test "choose different default runtime should succeed"'
- 'test "runc not existing when default_runtime changed should succeed"'
- 'test "retain default runtime should succeed"'
kata_skip_reload_config:
- 'test "reload config should remove pinned images when an empty list is provided"'
kata_skip_crio_wipe_tests:
Expand Down
7 changes: 4 additions & 3 deletions test/config.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ function teardown() {
@test "choose different default runtime should succeed" {
# when
unset CONTAINER_RUNTIMES
unset CONTAINER_DEFAULT_RUNTIME
RES=$("$CRIO_BINARY_PATH" -c "$TESTDATA"/50-crun-default.conf -d "" config 2>&1)

# then
Expand All @@ -66,6 +67,7 @@ function teardown() {
@test "runc not existing when default_runtime changed should succeed" {
# when
unset CONTAINER_RUNTIMES
unset CONTAINER_DEFAULT_RUNTIME
cat << EOF > "$TESTDIR"/50-runc-new-path.conf
[crio.runtime]
default_runtime = "crun"
Expand All @@ -83,6 +85,7 @@ EOF
}

@test "retain default runtime should succeed" {
unset CONTAINER_DEFAULT_RUNTIME
# when
RES=$("$CRIO_BINARY_PATH" -c "$TESTDATA"/50-crun.conf -d "" config 2>&1)

Expand All @@ -93,9 +96,7 @@ EOF
}

@test "monitor fields should be translated" {
if [[ "$RUNTIME_TYPE" == "vm" ]]; then
skip "not applicable to vm runtime type"
fi
unset CONTAINER_DEFAULT_RUNTIME
# when
RES=$("$CRIO_BINARY_PATH" --conmon-cgroup="pod" --conmon="/bin/true" -c "" -d "" config 2>&1)

Expand Down