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 <[email protected]>
apostasie · Apr 23, 2024 · e5c3f5f · e5c3f5f
1 parent 5d31eb4
commit e5c3f5f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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}"