testit-adapter-pytest 3.0.1__tar.gz → 3.1.0__tar.gz

{testit_adapter_pytest-3.0.1 → testit_adapter_pytest-3.1.0}/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.1
 Name: testit-adapter-pytest
-Version: 3.0.1
+Version: 3.1.0
 Summary: Pytest adapter for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
 Author-email: integrations@testit.software
 License: Apache-2.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -18,7 +16,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: attrs
-Requires-Dist: testit-python-commons==3.0.1
+Requires-Dist: testit-python-commons==3.1.0
 
 # Test IT TMS adapter for Pytest
 

{testit_adapter_pytest-3.0.1 → testit_adapter_pytest-3.1.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='testit-adapter-pytest',
-    version='3.0.1',
+    version='3.1.0',
     description='Pytest adapter for Test IT',
     long_description=open('README.md', "r").read(),
     long_description_content_type="text/markdown",
@@ -12,8 +12,6 @@ setup(
     license='Apache-2.0',
     classifiers=[
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
@@ -23,6 +21,6 @@ setup(
     py_modules=['testit_adapter_pytest'],
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
-    install_requires=['pytest', 'pytest-xdist', 'attrs', 'testit-python-commons==3.0.1'],
+    install_requires=['pytest', 'pytest-xdist', 'attrs', 'testit-python-commons==3.1.0'],
     entry_points={'pytest11': ['testit_adapter_pytest = testit_adapter_pytest.plugin']}
 )

{testit_adapter_pytest-3.0.1 → testit_adapter_pytest-3.1.0}/src/testit_adapter_pytest/listener.py

@@ -1,4 +1,5 @@
 import pickle
+from importlib.metadata import metadata
 from uuid import uuid4
 
 from packaging import version
@@ -61,6 +62,7 @@ class SeparationOfTests:
 
 class TmsListener(object):
     __executable_test = None
+    __pytest_info = None
     __pytest_check_info = None
     __failures = None
 
@@ -73,6 +75,8 @@ class TmsListener(object):
 
     @pytest.hookimpl
     def pytest_configure(self, config):
+        self.__pytest_info = metadata("pytest")
+
         if not hasattr(config, "workerinput") and not hasattr(self, "test_run_id"):
             config.test_run_id = self.__adapter_manager.get_test_run_id()
         else:
@@ -207,12 +211,6 @@ class TmsListener(object):
             name = f'{fixture_name}::{finalizer_name}'
             finalizers[index] = FixtureContext(finalizer, parent_uuid=container_uuid, name=name)
 
-        if self.__executable_test:
-            results_steps_data = self.__step_manager.get_steps_tree()
-
-            if fixturedef.scope == 'function':
-                self.__executable_test['setUpResults'] += results_steps_data
-
     @pytest.hookimpl(hookwrapper=True, trylast=True)
     def pytest_runtest_call(self):
         yield
@@ -221,18 +219,13 @@ class TmsListener(object):
             return
 
         test_results_steps = self.__step_manager.get_steps_tree()
-        self.__executable_test['stepResults'] = test_results_steps
+        self.__executable_test.step_results = test_results_steps
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_fixture_post_finalizer(self, fixturedef):
         if not self.__executable_test:
             return
 
-        teardown_results_steps = self.__step_manager.get_steps_tree()
-
-        if fixturedef.scope == 'function':
-            self.__executable_test['tearDownResults'] += teardown_results_steps
-
         yield
 
         if hasattr(fixturedef, 'cached_result') and self._cache.get(fixturedef):
@@ -243,28 +236,28 @@ class TmsListener(object):
     def pytest_runtest_logreport(self, report):
         if self.__executable_test:
             if report.when == 'setup':
-                self.__executable_test['outcome'] = STATUS.get(report.outcome, None)
+                self.__executable_test.outcome = STATUS.get(report.outcome, None)
                 if report.longreprtext:
-                    self.__executable_test['message'] = report.longreprtext
+                    self.__executable_test.message = report.longreprtext
 
             if report.when == 'call':
-                self.__executable_test['outcome'] = STATUS.get(report.outcome, None)
+                self.__executable_test.outcome = STATUS.get(report.outcome, None)
 
             if report.failed or hasattr(report, 'wasxfail') \
                     and not report.passed or report.outcome == 'rerun':
-                self.__executable_test['outcome'] = STATUS.get('failed', None)
+                self.__executable_test.outcome = STATUS.get('failed', None)
 
                 if report.longreprtext:
-                    self.__executable_test['traces'] = report.longreprtext
+                    self.__executable_test.traces = report.longreprtext
 
-            self.__executable_test['duration'] += report.duration * 1000
+            self.__executable_test.duration += report.duration * 1000
 
     @pytest.hookimpl
     def pytest_runtest_logfinish(self):
         if not self.__executable_test:
             return
 
-        self.__test_result_ids[self.__executable_test['externalID']] = self.__adapter_manager.write_test(
+        self.__test_result_ids[self.__executable_test.node_id] = self.__adapter_manager.write_test(
             utils.convert_executable_test_to_test_result_model(self.__executable_test))
 
     @pytest.hookimpl
@@ -281,22 +274,22 @@ class TmsListener(object):
     @adapter.hookimpl
     def add_link(self, link):
         if self.__executable_test:
-            self.__executable_test['resultLinks'].append(link)
+            self.__executable_test.result_links.append(link)
 
     @adapter.hookimpl
     def add_message(self, test_message):
         if self.__executable_test:
-            self.__executable_test['message'] = str(test_message)
+            self.__executable_test.message = str(test_message)
 
     @adapter.hookimpl
     def add_attachments(self, attach_paths: list or tuple):
         if self.__executable_test:
-            self.__executable_test['attachments'] += self.__adapter_manager.load_attachments(attach_paths)
+            self.__executable_test.attachments += self.__adapter_manager.load_attachments(attach_paths)
 
     @adapter.hookimpl
     def create_attachment(self, body, name: str):
         if self.__executable_test:
-            self.__executable_test['attachments'] += self.__adapter_manager.create_attachment(body, name)
+            self.__executable_test.attachments += self.__adapter_manager.create_attachment(body, name)
 
     @adapter.hookimpl
     def start_fixture(self, parent_uuid, uuid, title):
@@ -314,7 +307,7 @@ class TmsListener(object):
                                                 stacktrace=utils.get_traceback(exc_tb))
 
     def _update_fixtures_external_ids(self, item):
-        for fixturedef in _test_fixtures(item):
+        for fixturedef in self._test_fixtures(item):
             group_uuid = self._cache.get(fixturedef)
             if group_uuid:
                 group = self.fixture_manager.get_item(group_uuid)
@@ -322,18 +315,21 @@ class TmsListener(object):
                 group_uuid = self._cache.push(fixturedef)
                 group = FixturesContainer(uuid=group_uuid)
                 self.fixture_manager.start_group(group_uuid, group)
-            if item.test_external_id not in group.external_ids:
-                self.fixture_manager.update_group(group_uuid, external_ids=item.test_external_id)
+            if item.nodeid not in group.node_ids:
+                self.fixture_manager.update_group(group_uuid, node_ids=item.nodeid)
 
+    def _test_fixtures(self, item):
+        fixturemanager = item.session._fixturemanager
+        fixturedefs = []
 
-def _test_fixtures(item):
-    fixturemanager = item.session._fixturemanager
-    fixturedefs = []
+        if hasattr(item, "_request") and hasattr(item._request, "fixturenames"):
+            for name in item._request.fixturenames:
+                if self.__pytest_info and version.parse(self.__pytest_info["version"]) >= version.parse("8.1.0"):
+                    fixturedefs_pytest = fixturemanager.getfixturedefs(name, item)
+                else:
+                    fixturedefs_pytest = fixturemanager.getfixturedefs(name, item.nodeid)
 
-    if hasattr(item, "_request") and hasattr(item._request, "fixturenames"):
-        for name in item._request.fixturenames:
-            fixturedefs_pytest = fixturemanager.getfixturedefs(name, item.nodeid)
-            if fixturedefs_pytest:
-                fixturedefs.extend(fixturedefs_pytest)
+                if fixturedefs_pytest:
+                    fixturedefs.extend(fixturedefs_pytest)
 
-    return fixturedefs
+        return fixturedefs

testit_adapter_pytest-3.1.0/src/testit_adapter_pytest/models/executable_test.py

@@ -0,0 +1,31 @@
+from attr import attrs, attrib
+from attr import Factory
+
+
+@attrs
+class ExecutableTest:
+    external_id = attrib()
+    name = attrib()
+    steps = attrib(default=Factory(list))
+    step_results = attrib(default=Factory(list))
+    setup_steps = attrib(default=Factory(list))
+    setup_step_results = attrib(default=Factory(list))
+    teardown_steps = attrib(default=Factory(list))
+    teardown_step_results = attrib(default=Factory(list))
+    result_links = attrib(default=Factory(list))
+    duration = attrib(default=None)
+    outcome = attrib(default=None)
+    failure_reason_names = attrib(default=Factory(list))
+    traces = attrib(default=None)
+    attachments = attrib(default=Factory(list))
+    parameters = attrib(default=Factory(dict))
+    properties = attrib(default=Factory(dict))
+    namespace = attrib(default=None)
+    classname = attrib(default=None)
+    title = attrib(default=None)
+    description = attrib(default=None)
+    links = attrib(default=Factory(list))
+    labels = attrib(default=Factory(list))
+    work_item_ids = attrib(default=Factory(list))
+    message = attrib(default=None)
+    node_id = attrib(default=None)

{testit_adapter_pytest-3.0.1 → testit_adapter_pytest-3.1.0}/src/testit_adapter_pytest/models/fixture.py

@@ -19,6 +19,6 @@ class FixtureResult:
 @attrs
 class FixturesContainer:
     uuid = attrib(default=None)
-    external_ids = attrib(default=Factory(list))
+    node_ids = attrib(default=Factory(list))
     befores = attrib(default=Factory(list))
     afters = attrib(default=Factory(list))

{testit_adapter_pytest-3.0.1 → testit_adapter_pytest-3.1.0}/src/testit_adapter_pytest/utils.py

@@ -11,54 +11,44 @@ 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
 
+from testit_adapter_pytest.models.executable_test import ExecutableTest
+
 
 __ARRAY_TYPES = (frozenset, list, set, tuple,)
 
 
-def form_test(item):
-    data = {
-        'externalID': __get_external_id_from(item),
-        'autoTestName': __get_display_name_from(item),
-        'steps': [],
-        'stepResults': [],
-        'setUp': [],
-        'setUpResults': [],
-        'tearDown': [],
-        'tearDownResults': [],
-        'resultLinks': [],
-        'duration': 0,
-        'outcome': None,
-        'failureReasonName': None,
-        'traces': None,
-        'attachments': [],
-        'parameters': __get_parameters_from(item),
-        'properties': __get_properties_from(item),
-        'namespace': __get_namespace_from(item),
-        'classname': __get_class_name_from(item),
-        'title': __get_title_from(item),
-        'description': __get_description_from(item),
-        'links': __get_links_from(item),
-        'labels': __get_labels_from(item),
-        'workItemsID': __get_work_item_ids_from(item),
-        'message': None
-    }
+def form_test(item) -> ExecutableTest:
+    executable_test = ExecutableTest(
+        external_id=__get_external_id_from(item),
+        name=__get_display_name_from(item),
+        duration=0,
+        parameters=__get_parameters_from(item),
+        properties=__get_properties_from(item),
+        namespace=__get_namespace_from(item),
+        classname=__get_class_name_from(item),
+        title=__get_title_from(item),
+        description=__get_description_from(item),
+        links=__get_links_from(item),
+        labels=__get_labels_from(item),
+        work_item_ids=__get_work_item_ids_from(item),
+        node_id=item.nodeid
+    )
 
     if item.own_markers:
         for mark in item.own_markers:
             if mark.name == 'skip' or mark.name == 'skipif':
-                data['outcome'] = 'Skipped'
-                data['failureReasonName'] = None
+                executable_test.outcome = 'Skipped'
                 if mark.args:
-                    data['message'] = mark.args[0]
+                    executable_test.message = mark.args[0]
                 if mark.kwargs and 'reason' in mark.kwargs:
-                    data['message'] = mark.kwargs['reason']
+                    executable_test.message = mark.kwargs['reason']
             if mark.name == 'xfail':
                 if mark.args:
-                    data['message'] = mark.args[0]
+                    executable_test.message = mark.args[0]
                 if mark.kwargs and 'reason' in mark.kwargs:
-                    data['message'] = mark.kwargs['reason']
+                    executable_test.message = mark.kwargs['reason']
 
-    return data
+    return executable_test
 
 
 def __get_display_name_from(item):
@@ -131,7 +121,7 @@ def __get_links_from(item):
 
 
 def __get_parameters_from(item):
-    if hasattr(item, 'array_parametrize_mark_id'):
+    if hasattr(item, 'callspec'):
         test_parameters = {}
         for key, parameter in item.callspec.params.items():
             test_parameters[key] = str(parameter)
@@ -299,28 +289,28 @@ def get_hash(value: str):
     return md.hexdigest()
 
 
-def convert_executable_test_to_test_result_model(executable_test: dict) -> TestResult:
+def convert_executable_test_to_test_result_model(executable_test: ExecutableTest) -> TestResult:
     return TestResult()\
-        .set_external_id(executable_test['externalID'])\
-        .set_autotest_name(executable_test['autoTestName'])\
-        .set_step_results(executable_test['stepResults'])\
-        .set_setup_results(executable_test['setUpResults'])\
-        .set_teardown_results(executable_test['tearDownResults'])\
-        .set_duration(executable_test['duration'])\
-        .set_outcome(executable_test['outcome'])\
-        .set_traces(executable_test['traces'])\
-        .set_attachments(executable_test['attachments'])\
-        .set_parameters(executable_test['parameters'])\
-        .set_properties(executable_test['properties'])\
-        .set_namespace(executable_test['namespace'])\
-        .set_classname(executable_test['classname'])\
-        .set_title(executable_test['title'])\
-        .set_description(executable_test['description'])\
-        .set_links(executable_test['links'])\
-        .set_result_links(executable_test['resultLinks'])\
-        .set_labels(executable_test['labels'])\
-        .set_work_item_ids(executable_test['workItemsID'])\
-        .set_message(executable_test['message'])
+        .set_external_id(executable_test.external_id)\
+        .set_autotest_name(executable_test.name)\
+        .set_step_results(executable_test.step_results)\
+        .set_setup_results(executable_test.setup_step_results)\
+        .set_teardown_results(executable_test.teardown_step_results)\
+        .set_duration(executable_test.duration)\
+        .set_outcome(executable_test.outcome)\
+        .set_traces(executable_test.traces)\
+        .set_attachments(executable_test.attachments)\
+        .set_parameters(executable_test.parameters)\
+        .set_properties(executable_test.properties)\
+        .set_namespace(executable_test.namespace)\
+        .set_classname(executable_test.classname)\
+        .set_title(executable_test.title)\
+        .set_description(executable_test.description)\
+        .set_links(executable_test.links)\
+        .set_result_links(executable_test.result_links)\
+        .set_labels(executable_test.labels)\
+        .set_work_item_ids(executable_test.work_item_ids)\
+        .set_message(executable_test.message)
 
 
 def fixtures_containers_to_test_results_with_all_fixture_step_results(
@@ -328,11 +318,11 @@ def fixtures_containers_to_test_results_with_all_fixture_step_results(
         test_result_ids: dict) -> typing.List[TestResultWithAllFixtureStepResults]:
     test_results_with_all_fixture_step_results = []
 
-    for external_id, test_result_id in test_result_ids.items():
+    for node_id, test_result_id in test_result_ids.items():
         test_result_with_all_fixture_step_results = TestResultWithAllFixtureStepResults(test_result_id)
 
         for uuid, fixtures_container in fixtures_containers.items():
-            if external_id in fixtures_container.external_ids:
+            if node_id in fixtures_container.node_ids:
                 if fixtures_container.befores:
                     test_result_with_all_fixture_step_results.set_setup_results(fixtures_container.befores[0].steps)
 

{testit_adapter_pytest-3.0.1 → testit_adapter_pytest-3.1.0}/src/testit_adapter_pytest.egg-info/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.1
 Name: testit-adapter-pytest
-Version: 3.0.1
+Version: 3.1.0
 Summary: Pytest adapter for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
 Author-email: integrations@testit.software
 License: Apache-2.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -18,7 +16,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: attrs
-Requires-Dist: testit-python-commons==3.0.1
+Requires-Dist: testit-python-commons==3.1.0
 
 # Test IT TMS adapter for Pytest
 

{testit_adapter_pytest-3.0.1 → testit_adapter_pytest-3.1.0}/src/testit_adapter_pytest.egg-info/SOURCES.txt

@@ -14,4 +14,5 @@ src/testit_adapter_pytest.egg-info/entry_points.txt
 src/testit_adapter_pytest.egg-info/requires.txt
 src/testit_adapter_pytest.egg-info/top_level.txt
 src/testit_adapter_pytest/models/__init__.py
+src/testit_adapter_pytest/models/executable_test.py
 src/testit_adapter_pytest/models/fixture.py

testit_adapter_pytest-3.1.0/src/testit_adapter_pytest.egg-info/requires.txt

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

testit_adapter_pytest-3.0.1/src/testit_adapter_pytest.egg-info/requires.txt

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