testit-adapter-pytest 3.10.8.post550__tar.gz → 3.10.10rc1__tar.gz

{testit_adapter_pytest-3.10.8.post550 → testit_adapter_pytest-3.10.10rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-adapter-pytest
-Version: 3.10.8.post550
+Version: 3.10.10rc1
 Summary: Pytest adapter for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
@@ -16,7 +16,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: attrs
-Requires-Dist: testit-python-commons==3.10.8.post550
+Requires-Dist: testit-python-commons==3.10.10rc1
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{testit_adapter_pytest-3.10.8.post550 → testit_adapter_pytest-3.10.10rc1}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "3.10.8.post550"
+VERSION = "3.10.10rc1"
 
 setup(
     name='testit-adapter-pytest',

{testit_adapter_pytest-3.10.8.post550 → testit_adapter_pytest-3.10.10rc1}/src/testit_adapter_pytest/utils.py

@@ -8,6 +8,7 @@ import pytest
 
 from traceback import format_exception_only
 
+from _pytest.mark import Mark
 from testit_python_commons.models.link import Link
 from testit_python_commons.models.test_result import TestResult
 from testit_python_commons.models.test_result_with_all_fixture_step_results_model import TestResultWithAllFixtureStepResults
@@ -36,18 +37,24 @@ def form_test(item) -> ExecutableTest:
     )
 
     if item.own_markers:
-        for mark in item.own_markers:
-            if mark.name == 'skip' or mark.name == 'skipif':
-                executable_test.outcome = 'Skipped'
-                if mark.args:
-                    executable_test.message = mark.args[0]
-                if mark.kwargs and 'reason' in mark.kwargs:
-                    executable_test.message = mark.kwargs['reason']
-            if mark.name == 'xfail':
-                if mark.args:
-                    executable_test.message = mark.args[0]
-                if mark.kwargs and 'reason' in mark.kwargs:
-                    executable_test.message = mark.kwargs['reason']
+        executable_test = __set_outcome_and_message_from_markers(executable_test, item.own_markers)
+
+    return executable_test
+
+
+def __set_outcome_and_message_from_markers(executable_test: ExecutableTest, markers: List[Mark]) -> ExecutableTest:
+    for marker in markers:
+        if marker.name in ('skip', 'skipif'):
+            executable_test.outcome = 'Skipped'
+        if marker.name in ('skip', 'skipif', 'xfail'):
+            if len(marker.args) == 1 and isinstance(marker.args, str):
+                executable_test.message = marker.args[0]
+
+            condition_in_args = marker.args and marker.args[0]
+            condition_in_kwargs = marker.kwargs and 'condition' in marker.kwargs and marker.kwargs['condition']
+
+            if (condition_in_kwargs or condition_in_args) and 'reason' in marker.kwargs:
+                executable_test.message = marker.kwargs['reason']
 
     return executable_test
 

{testit_adapter_pytest-3.10.8.post550 → testit_adapter_pytest-3.10.10rc1}/src/testit_adapter_pytest.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-adapter-pytest
-Version: 3.10.8.post550
+Version: 3.10.10rc1
 Summary: Pytest adapter for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
@@ -16,7 +16,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: attrs
-Requires-Dist: testit-python-commons==3.10.8.post550
+Requires-Dist: testit-python-commons==3.10.10rc1
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

testit_adapter_pytest-3.10.10rc1/src/testit_adapter_pytest.egg-info/requires.txt

@@ -0,0 +1,4 @@
+pytest
+pytest-xdist
+attrs
+testit-python-commons==3.10.10rc1

testit_adapter_pytest-3.10.8.post550/src/testit_adapter_pytest.egg-info/requires.txt

@@ -1,4 +0,0 @@
-pytest
-pytest-xdist
-attrs
-testit-python-commons==3.10.8.post550