upstream ci: Avoid scheduling tests that will not be executed.

Currently, all tests are scheduled to execution, even those that are
not executed due to be absent from the list of enabled tests configured
in the IPA_ENABLED_* variables. The tests that are not executed are
marked 'skipped'.

This patch change this behavior by no scheduling tests that are not on
the list of enabled tests, if any of the IPA_ENABLED_* variables is set

The behavior of disabled tests is not changed and the test is 'skipped'

tests/test_playbook_runs.py

@@ -24,7 +24,9 @@
 
 from unittest import TestCase
 
-from utils import get_test_playbooks, get_skip_conditions, run_playbook
+from utils import (
+    get_test_playbooks, get_skip_conditions, run_playbook, get_enabled_test
+)
 
 
 def prepare_test(testname, testpath):
@@ -56,16 +58,17 @@ def wrapper(*args, **kwargs):
         test_name = playbook["name"].replace("-", "_")
         test_path = playbook["path"]
 
-        skip = get_skip_conditions(test_dir_name, test_name) or {}
+        if get_enabled_test(test_dir_name, test_name):
+            skip = get_skip_conditions(test_dir_name, test_name) or {}
 
-        # pylint: disable=W0621,W0640,W0613
-        @pytest.mark.skipif(**skip)
-        @pytest.mark.playbook
-        @prepare_test(test_name, test_path)
-        def method(self, test_path, test_name):
-            run_playbook(test_path)
-        # pylint: enable=W0621,W0640,W0613
+            # pylint: disable=W0621,W0640,W0613
+            @pytest.mark.skipif(**skip)
+            @pytest.mark.playbook
+            @prepare_test(test_name, test_path)
+            def method(self, test_path, test_name):
+                run_playbook(test_path)
+            # pylint: enable=W0621,W0640,W0613
 
-        _tests[test_name] = method
+            _tests[test_name] = method
 
     globals()[test_dir_name] = type(test_dir_name, tuple([TestCase]), _tests,)

tests/utils.py

@@ -95,12 +95,12 @@ def get_disabled_test(group_name, test_name):
 def get_enabled_test(group_name, test_name):
     enabled_modules = [
         enabled.strip()
-        for enabled in os.environ.get("IPA_ENABLED_MODULES", "").split(":")
+        for enabled in os.environ.get("IPA_ENABLED_MODULES", "").split(",")
         if enabled.strip()
     ]
     enabled_tests = [
         enabled.strip()
-        for enabled in os.environ.get("IPA_ENABLED_TESTS", "").split(":")
+        for enabled in os.environ.get("IPA_ENABLED_TESTS", "").split(",")
         if enabled.strip()
     ]
 
@@ -128,9 +128,6 @@ def get_skip_conditions(group_name, test_name):
             "reason": "Environment variable IPA_SERVER_HOST must be set",
         }
 
-    if not get_enabled_test(group_name, test_name):
-        return {"condition": True, "reason": "Test not configured to run"}
-
     if get_disabled_test(group_name, test_name):
         return {"condition": True, "reason": "Test configured to not run"}