From e5c3f5fa9b4017b4892c3855701347ebbb8da9f5 Mon Sep 17 00:00:00 2001 From: Dan Mihai Date: Tue, 23 Apr 2024 16:07:03 +0000 Subject: [PATCH] tests: no generated policy for untested platforms Avoid auto-generating Policy on platforms that haven't been tested yet with auto-generated Policy. Support for auto-generated Policy on these additional platforms is coming up in future PRs, so the tests being fixed here were prematurely enabled. Signed-off-by: Dan Mihai --- tests/integration/kubernetes/k8s-policy-job.bats | 4 ++-- tests/integration/kubernetes/k8s-policy-pod.bats | 4 ++-- tests/integration/kubernetes/k8s-policy-rc.bats | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/integration/kubernetes/k8s-policy-job.bats b/tests/integration/kubernetes/k8s-policy-job.bats index caf36ed71..81fd105ed 100644 --- a/tests/integration/kubernetes/k8s-policy-job.bats +++ b/tests/integration/kubernetes/k8s-policy-job.bats @@ -9,7 +9,7 @@ load "${BATS_TEST_DIRNAME}/../../common.bash" load "${BATS_TEST_DIRNAME}/tests_common.sh" setup() { - policy_tests_enabled || skip "Policy tests are disabled." + auto_generate_policy_enabled || skip "Auto-generated policy tests are disabled." get_pod_config_dir @@ -171,7 +171,7 @@ test_job_policy_error() { } teardown() { - policy_tests_enabled || skip "Policy tests are disabled." + auto_generate_policy_enabled || skip "Auto-generated policy tests are disabled." # Debugging information for pod_name in ${pod_names[@]}; do diff --git a/tests/integration/kubernetes/k8s-policy-pod.bats b/tests/integration/kubernetes/k8s-policy-pod.bats index 7699768af..5a6be1c1e 100644 --- a/tests/integration/kubernetes/k8s-policy-pod.bats +++ b/tests/integration/kubernetes/k8s-policy-pod.bats @@ -9,7 +9,7 @@ load "${BATS_TEST_DIRNAME}/../../common.bash" load "${BATS_TEST_DIRNAME}/tests_common.sh" setup() { - policy_tests_enabled || skip "Policy tests are disabled." + auto_generate_policy_enabled || skip "Auto-generated policy tests are disabled." configmap_name="policy-configmap" pod_name="policy-pod" @@ -144,7 +144,7 @@ test_pod_policy_error() { } teardown() { - policy_tests_enabled || skip "Policy tests are disabled." + auto_generate_policy_enabled || skip "Auto-generated policy tests are disabled." # Debugging information. Don't print the "Message:" line because it contains a truncated policy log. kubectl describe pod "${pod_name}" | grep -v "Message:" diff --git a/tests/integration/kubernetes/k8s-policy-rc.bats b/tests/integration/kubernetes/k8s-policy-rc.bats index f64b13600..363b6cf14 100644 --- a/tests/integration/kubernetes/k8s-policy-rc.bats +++ b/tests/integration/kubernetes/k8s-policy-rc.bats @@ -9,7 +9,7 @@ load "${BATS_TEST_DIRNAME}/../../common.bash" load "${BATS_TEST_DIRNAME}/tests_common.sh" setup() { - policy_tests_enabled || skip "Policy tests are disabled." + auto_generate_policy_enabled || skip "Auto-generated policy tests are disabled." replication_name="policy-rc-test" app_name="policy-nginx-rc" @@ -156,7 +156,7 @@ test_rc_policy() { } teardown() { - policy_tests_enabled || skip "Policy tests are disabled." + auto_generate_policy_enabled || skip "Auto-generated policy tests are disabled." # Debugging information kubectl describe rc "${replication_name}"