tests/integration/defs/conftest.py (2)

2062-2069: Improve CLI UX: allow multiple --test-model-suites flags and clarify help

Let users pass the flag multiple times instead of space/semicolon splitting in a single string. This is more standard for pytest and avoids parsing pitfalls.

Apply this diff:

-    parser.addoption(
-        "--test-model-suites",
-        action="store",
-        default=None,
-        help=
-        "Specify test model suites separated by semicolons or spaces. Each suite can contain special characters. "
-        "Example: --test-model-suites=suite1;suite2;suite3 or --test-model-suites=suite1 suite2 suite3",
-    )
+    parser.addoption(
+        "--test-model-suites",
+        action="append",
+        default=[],
+        help=(
+            "Specify test model suites. May be provided multiple times, or as a single value "
+            "with names separated by semicolons or spaces. "
+            "Examples: --test-model-suites suite1 --test-model-suites suite2 "
+            "or --test-model-suites='suite1;suite2'"
+        ),
+    )

---

2169-2212: Make matching case-insensitive and handle list inputs; simplify loop

• Accept list inputs (if switching to action="append").
• Case-insensitive substring match to reduce surprises.
• Minor simplification and micro-optimizations.

Apply this diff:

-def deselect_by_test_model_suites(test_model_suites, items, test_prefix, config):
-    """Filter tests based on the test model suites specified.
-    If a test matches any of the test model suite names, it is considered selected.
-    
-    Args:
-        test_model_suites: String containing test model suite names separated by semicolons
-        items: List of pytest items to filter
-        test_prefix: Test prefix if any
-        config: Pytest config object
-    """
-    if not test_model_suites:
-        return
-    
-    # Split by semicolon or space and strip whitespace
-    suite_names = [suite.strip() for suite in test_model_suites.replace(';', ' ').split() if suite.strip()]
-    
-    if not suite_names:
-        return
-    
-    selected = []
-    deselected = []
-    
-    for item in items:
-        # Get the test name without prefix for comparison
-        test_name = item.nodeid
-        if test_prefix and test_name.startswith(f"{test_prefix}/"):
-            test_name = test_name[len(f"{test_prefix}/"):]
-        
-        # Check if any suite name matches the test name
-        found = False
-        for suite_name in suite_names:
-            if suite_name in test_name or test_name.endswith(suite_name):
-                found = True
-                break
-        
-        if found:
-            selected.append(item)
-        else:
-            deselected.append(item)
-    
-    if deselected:
-        config.hook.pytest_deselected(items=deselected)
-    items[:] = selected
+def deselect_by_test_model_suites(test_model_suites, items, test_prefix, config):
+    """Filter tests based on the test model suites specified.
+    A test is selected if any suite name is a substring of the test's nodeid (case-insensitive).
+
+    Args:
+        test_model_suites: String or list of strings with suite names. Strings may contain semicolon/space-separated names.
+        items: List of pytest items to filter.
+        test_prefix: Optional test prefix to strip from nodeid during matching.
+        config: Pytest config object.
+    """
+    if not test_model_suites:
+        return
+
+    # Normalize input to a list of suite tokens
+    if isinstance(test_model_suites, str):
+        raw_tokens = test_model_suites.replace(";", " ").split()
+    else:
+        raw_tokens = []
+        for entry in test_model_suites:
+            if entry:
+                raw_tokens.extend(str(entry).replace(";", " ").split())
+
+    suite_names = [t.strip().lower() for t in raw_tokens if t and t.strip()]
+    if not suite_names:
+        return
+
+    selected, deselected = [], []
+    for item in items:
+        # Get the test name without prefix for comparison
+        test_name = item.nodeid
+        if test_prefix and test_name.startswith(f"{test_prefix}/"):
+            test_name = test_name[len(f"{test_prefix}/"):]
+        test_name_lower = test_name.lower()
+
+        if any(suite in test_name_lower for suite in suite_names):
+            selected.append(item)
+        else:
+            deselected.append(item)
+
+    if deselected:
+        config.hook.pytest_deselected(items=deselected)
+    items[:] = selected

Optional: If you want to support quoted suite names (with spaces), switch to shlex-based parsing and add import shlex at the top:

• Parsing idea: for chunk in test_model_suites.split(';'): suite_names.extend(shlex.split(chunk))

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro