pytest-json-ctrf 0.3.1__tar.gz → 0.3.3__tar.gz

{pytest_json_ctrf-0.3.1 → pytest_json_ctrf-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-json-ctrf
-Version: 0.3.1
+Version: 0.3.3
 Summary: Pytest plugin to generate json report in CTRF (Common Test Report Format)
 Author: Oleksii Ostapov
 Project-URL: Infopulse, https://infopulse.com/

{pytest_json_ctrf-0.3.1 → pytest_json_ctrf-0.3.3}/ctrf/Report.py

@@ -2,6 +2,7 @@ import os
 import pytest
 import time
 import json
+from typing import Optional
 from pytest import TestReport
 from collections import OrderedDict
 from .TestObject import TestObject, TestStatus
@@ -54,8 +55,15 @@ class Report:
     def process_retries(self) -> None:
         for test_id, test_data in self.test_items.items():
             name = test_id.split('[')[0]
-            test = self.prepared_tests.get(name)
+            test: Optional[TestObject] = self.prepared_tests.get(name)
             if test:
+                test.status = test_data.status
+                test.raw_status = test_data.raw_status
+                if test_data.status != TestStatus.PASSED:
+                    test.status = test_data.status
+                    test.raw_status = test_data.raw_status
+                    test.message = test_data.message
+                    test.trace = test_data.trace
                 test.retries += 1
             else:
                 self.prepared_tests[name] = test_data

{pytest_json_ctrf-0.3.1 → pytest_json_ctrf-0.3.3}/ctrf/TestObject.py

@@ -14,7 +14,7 @@ class TestStatus(Enum):
 
 class TestObject:
     name: str
-    status: TestStatus
+    _status: TestStatus
     raw_status: str
     duration: float = 0
     start: float
@@ -30,8 +30,8 @@ class TestObject:
 
     def __init__(self, report: TestReport, worker_id: str or None = None):
         self.name = report.nodeid.split('[')[0]
-        self.status = TestStatus.PENDING
-        self.status = self.set_status(report)
+        self._status = TestStatus.PENDING
+        self._status = self.set_status(report)
         self.raw_status = None
         self.duration = 0
         self.start = 0
@@ -45,13 +45,25 @@ class TestObject:
         self.browser = None
         self.trace = None
 
+    @property
+    def status(self) -> TestStatus:
+        return self._status
+
+    @status.setter
+    def status(self, value: TestStatus) -> None:
+        if self._status in (TestStatus.PENDING, TestStatus.PASSED):
+            self._status = value
+            return
+        elif self._status in (TestStatus.SKIPPED, TestStatus.FAILED):
+            return
+
     def set_status(self, report: TestReport) -> TestStatus:
-        if self.status in (TestStatus.SKIPPED, TestStatus.FAILED):
-            return self.status
+        if self._status in (TestStatus.SKIPPED, TestStatus.FAILED):
+            return self._status
         elif report.skipped:
-            self.status = TestStatus.SKIPPED
+            self._status = TestStatus.SKIPPED
         elif report.failed:
-            self.status = TestStatus.FAILED
+            self._status = TestStatus.FAILED
             self.raw_status = f"{report.when}_{report.outcome}"
             self.message = f"The test failed in the {report.when} phase"
             if hasattr(report, 'longreprtext'):
@@ -60,10 +72,10 @@ class TestObject:
                 elif "Exception" in report.longreprtext:
                     self.message += " due to an exception"
         elif report.passed:
-            self.status = TestStatus.PASSED
+            self._status = TestStatus.PASSED
         else:
-            self.status = TestStatus.OTHER
-        return self.status
+            self._status = TestStatus.OTHER
+        return self._status
 
     def update(self, report: TestReport) -> None:
         self.set_status(report)
@@ -81,7 +93,7 @@ class TestObject:
     def serialize(self) -> dict:
         result: dict[str, Any] = {
             'name': self.name,
-            'status': self.status.value,
+            'status': self._status.value,
             'raw_status': self.raw_status,
             'duration': self.duration,
             'start': self.start,

{pytest_json_ctrf-0.3.1 → pytest_json_ctrf-0.3.3}/ctrf/main.py

@@ -34,7 +34,16 @@ def pytest_unconfigure(config: Config):
 def ctrf_json_metadata(request: FixtureRequest):
     if not request.config.option.ctrf:
         return
-    tags = [mark.name for mark in request.node.iter_markers()]
+    tags = list()
+    for mark in request.node.iter_markers():
+        tag = mark.name
+        if mark.args:
+            for arg in mark.args:
+                tag += f'::{arg}'
+        if mark.kwargs:
+            for key, value in mark.kwargs.items():
+                tag += f'::{key}_{value}'
+        tags.append(tag)
     request.node._ctrf_metadata.setdefault('tags', tags)
     if hasattr(request.node, 'callspec'):
         browser = request.node.callspec.params.get('browser_name')

{pytest_json_ctrf-0.3.1 → pytest_json_ctrf-0.3.3}/pyproject.toml

@@ -10,7 +10,7 @@ exclude = [
 
 [project]
 name = "pytest-json-ctrf"
-version = "0.3.1"
+version = "0.3.3"
 
 dependencies = [
     "pytest>6.0.0",

{pytest_json_ctrf-0.3.1 → pytest_json_ctrf-0.3.3}/pytest_json_ctrf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-json-ctrf
-Version: 0.3.1
+Version: 0.3.3
 Summary: Pytest plugin to generate json report in CTRF (Common Test Report Format)
 Author: Oleksii Ostapov
 Project-URL: Infopulse, https://infopulse.com/

{pytest_json_ctrf-0.3.1 → pytest_json_ctrf-0.3.3}/tests/test_example.py

@@ -50,3 +50,16 @@ def test_do_calculations_8_post_error(post_fail):
 @mark.parametrize('param', [1, 2, 3, 4, 5])
 def test_parametrized(param):
     assert param < 10
+
+
+@mark.parametrize('param', [6, 7, 8, 9, 10])
+def test_parametrized_fail(param):
+    assert param != 8
+
+@mark.test_id(1234, hello='world')
+def test_with_test_id():
+    assert 1 == 1
+
+@mark.test_id(1235)
+def test_with_test_id_2():
+    assert 1 == 1

{pytest_json_ctrf-0.3.1 → pytest_json_ctrf-0.3.3}/tests/test_plugin.py

@@ -25,13 +25,13 @@ def ctrf_report_xdist(pytester: Pytester):
 def test_without_plugin_no_xdist(pytester: Pytester):
     pytester.copy_example(test_file)
     result = pytester.runpytest(*basic_test_args)
-    result.assert_outcomes(passed=9, skipped=1, failed=2, errors=2)
+    result.assert_outcomes(passed=15, skipped=1, failed=3, errors=2)
 
 
 def test_without_plugin_with_xdist(pytester: Pytester):
     pytester.copy_example(test_file)
     result = pytester.runpytest(*[*basic_test_args, "-n", "3"])
-    result.assert_outcomes(passed=9, skipped=1, failed=2, errors=2)
+    result.assert_outcomes(passed=15, skipped=1, failed=3, errors=2)
     assert "created: 3/3 workers" in result.stdout.str()
 
 
@@ -48,9 +48,9 @@ def test_with_markers(pytester: Pytester):
 
 
 def test_with_plugin_no_xdist(ctrf_report_sync):
-    assert ctrf_report_sync["results"]["summary"]["tests"] == 9
-    assert ctrf_report_sync["results"]["summary"]["passed"] == 4
-    assert ctrf_report_sync["results"]["summary"]["failed"] == 4
+    assert ctrf_report_sync["results"]["summary"]["tests"] == 12
+    assert ctrf_report_sync["results"]["summary"]["passed"] == 6
+    assert ctrf_report_sync["results"]["summary"]["failed"] == 5
     assert ctrf_report_sync["results"]["summary"]["skipped"] == 1
 
 
@@ -70,9 +70,9 @@ def test_any_test_has_timestamps(ctrf_report_sync):
 
 
 def test_with_plugin_with_xdist(ctrf_report_xdist):
-    assert ctrf_report_xdist["results"]["summary"]["tests"] == 9
-    assert ctrf_report_xdist["results"]["summary"]["passed"] == 4
-    assert ctrf_report_xdist["results"]["summary"]["failed"] == 4
+    assert ctrf_report_xdist["results"]["summary"]["tests"] == 12
+    assert ctrf_report_xdist["results"]["summary"]["passed"] == 6
+    assert ctrf_report_xdist["results"]["summary"]["failed"] == 5
     assert ctrf_report_xdist["results"]["summary"]["skipped"] == 1