Merge name filters into one

`-k` option can't given more than once to pytest merge the filters from cli and job definition into one Signed-off-by: BenjiReis <[email protected]>
xcp-ng · Sep 28, 2023 · fa36a9d · fa36a9d
1 parent 0d076de
commit fa36a9d
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/jobs.py b/jobs.py
@@ -284,6 +284,19 @@ def build_pytest_cmd(job_data, hosts=None, pytest_args=[]):
 
     job_params = dict(job_data["params"])
 
+    # Merge name filter
+    try:
+        i = pytest_args.index("-k")
+        cli_name_filter = pytest_args[i + 1]
+        del pytest_args[i + 1]
+        del pytest_args[i]
+        if name_filter:
+            name_filter = f"({name_filter}) and ({cli_name_filter})"
+        else:
+            name_filter = cli_name_filter
+    except ValueError:
+        pass
+
     # pytest_args may override job_params
     pytest_args_keys = []
     for arg in pytest_args: