Fix --allure-severities argument of allure-pytest (fixes allure-framework#260, allure-framework#261) (allure-framework#729)

delatrie · web-flow · commit 919d3df10aae · 2023-01-30T12:06:27.000+03:00
diff --git a/allure-pytest/src/plugin.py b/allure-pytest/src/plugin.py
@@ -4,7 +4,7 @@
 import allure_commons
 import os
 
-from allure_commons.types import LabelType
+from allure_commons.types import LabelType, Severity
 from allure_commons.logger import AllureFileLogger
 from allure_commons.utils import get_testplan
 
@@ -44,7 +44,7 @@ def label_type(type_name, legal_values=set()):
         def a_label_type(string):
             atoms = set(string.split(','))
             if type_name is LabelType.SEVERITY:
-                if not atoms < legal_values:
+                if not atoms <= legal_values:
                     raise argparse.ArgumentTypeError('Illegal {} values: {}, only [{}] are allowed'.format(
                         type_name,
                         ', '.join(atoms - legal_values),
@@ -175,16 +175,25 @@ def pytest_configure(config):
 
 
 def select_by_labels(items, config):
-    arg_labels = set().union(config.option.allure_epics,
-                             config.option.allure_features,
-                             config.option.allure_stories,
-                             config.option.allure_ids,
-                             config.option.allure_severities,
-                             *config.option.allure_labels)
+    arg_labels = set().union(
+        config.option.allure_epics,
+        config.option.allure_features,
+        config.option.allure_stories,
+        config.option.allure_ids,
+        config.option.allure_severities,
+        *config.option.allure_labels
+    )
     if arg_labels:
         selected, deselected = [], []
         for item in items:
-            selected.append(item) if arg_labels & set(allure_labels(item)) else deselected.append(item)
+            test_labels = set(allure_labels(item))
+            test_severity = allure_label(item, LabelType.SEVERITY)
+            if not test_severity:
+                test_labels.add((LabelType.SEVERITY, Severity.NORMAL))
+            if arg_labels & test_labels:
+                selected.append(item)
+            else:
+                deselected.append(item)
         return selected, deselected
     else:
         return items, []
diff --git a/allure-pytest/test/acceptance/label/severity/select_severity_test.py b/allure-pytest/test/acceptance/label/severity/select_severity_test.py
@@ -7,15 +7,30 @@
 @pytest.mark.parametrize(
     ["severities", "expected_tests"],
     [
-        (["critical", "minor"],
-         [
-             "test_vip",
-             "test_minor"
-         ]),
-        (["critical"],
-         [
-             "test_vip",
-         ]),
+        pytest.param(
+            ["critical", "minor"],
+            ["test_vip", "test_minor"],
+            id="critical,minor"
+        ),
+        pytest.param(
+            ["critical"],
+            ["test_vip"],
+            id="critical"
+        ),
+        pytest.param(
+            ["normal"],
+            ["test_with_default_severity"],
+            id="normal"
+        ),
+        pytest.param(
+            ["trivial", "minor", "normal", "critical", "blocker"],
+            [
+                "test_vip",
+                "test_with_default_severity",
+                "test_minor"
+            ],
+            id="all"
+        )
     ]
 )
 def test_select_by_severity_level(allured_testdir, severities, expected_tests):
