testit-adapter-pytest 2.8.3__tar.gz → 3.0.0__tar.gz

{testit-adapter-pytest-2.8.3 → testit_adapter_pytest-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testit-adapter-pytest
-Version: 2.8.3
+Version: 3.0.0
 Summary: Pytest adapter for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: attrs
-Requires-Dist: testit-python-commons==2.8.3
+Requires-Dist: testit-python-commons==3.0.0
 
 # Test IT TMS adapter for Pytest
 

{testit-adapter-pytest-2.8.3 → testit_adapter_pytest-3.0.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='testit-adapter-pytest',
-    version='2.8.3',
+    version='3.0.0',
     description='Pytest adapter for Test IT',
     long_description=open('README.md', "r").read(),
     long_description_content_type="text/markdown",
@@ -23,6 +23,6 @@ setup(
     py_modules=['testit_adapter_pytest'],
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
-    install_requires=['pytest', 'pytest-xdist', 'attrs', 'testit-python-commons==2.8.3'],
+    install_requires=['pytest', 'pytest-xdist', 'attrs', 'testit-python-commons==3.0.0'],
     entry_points={'pytest11': ['testit_adapter_pytest = testit_adapter_pytest.plugin']}
 )

{testit-adapter-pytest-2.8.3 → testit_adapter_pytest-3.0.0}/src/testit_adapter_pytest/listener.py

@@ -128,10 +128,8 @@ class TmsListener(object):
         index = 0
 
         for item in items:
-            if hasattr(item.function, 'test_external_id'):
-                item.test_external_id = item.function.test_external_id
-            else:
-                item.test_external_id = utils.get_hash(item.nodeid + item.function.__name__)
+            if not hasattr(item.function, 'test_external_id'):
+                item.function.test_external_id = utils.get_hash(item.parent.nodeid + item.function.__name__)
 
             if item.own_markers:
                 for mark in item.own_markers:
@@ -142,8 +140,8 @@ class TmsListener(object):
                             item.own_markers.index(mark))
 
             params = utils.get_all_parameters(item)
-            item.test_external_id = utils.collect_parameters_in_string_attribute(
-                item.test_external_id,
+            item.function.test_external_id = utils.collect_parameters_in_string_attribute(
+                item.function.test_external_id,
                 params)
 
             item.index = index
@@ -151,7 +149,7 @@ class TmsListener(object):
             index = index + 1 if len(items) > item_id + 1 and items[item_id + 1].originalname == item.originalname \
                 else 0
 
-            if cls.__check_external_id_in_resolved_autotests(item.test_external_id, resolved_autotests):
+            if cls.__check_external_id_in_resolved_autotests(item.function.test_external_id, resolved_autotests):
                 separation_of_tests.add_item_to_selected_items(item)
             else:
                 separation_of_tests.add_item_to_deselected_items(item)
@@ -165,19 +163,6 @@ class TmsListener(object):
 
     @pytest.hookimpl(tryfirst=True)
     def pytest_runtest_protocol(self, item):
-        if not hasattr(item.function, 'test_external_id'):
-            item.test_external_id = utils.get_hash(item.nodeid + item.function.__name__)
-
-        if not hasattr(item.function, 'test_displayname'):
-            item.test_displayname = item.function.__doc__ if \
-                item.function.__doc__ else item.function.__name__
-        else:
-            params = utils.get_all_parameters(item)
-
-            item.test_displayname = utils.collect_parameters_in_string_attribute(
-                item.function.test_displayname,
-                params)
-
         self.__executable_test = utils.form_test(item)
 
     @pytest.hookimpl(hookwrapper=True)
@@ -335,8 +320,8 @@ 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.function.test_external_id not in group.external_ids:
+                self.fixture_manager.update_group(group_uuid, external_ids=item.function.test_external_id)
 
 
 def _test_fixtures(item):

{testit-adapter-pytest-2.8.3 → testit_adapter_pytest-3.0.0}/src/testit_adapter_pytest/utils.py

@@ -75,7 +75,7 @@ def __get_external_id_from(item):
     external_id = __search_attribute(item, 'test_external_id')
 
     if not external_id:
-        return get_hash(item.nodeid + item.function.__name__)
+        return get_hash(item.parent.nodeid + item.function.__name__)
 
     return collect_parameters_in_string_attribute(external_id, get_all_parameters(item))
 

{testit-adapter-pytest-2.8.3 → testit_adapter_pytest-3.0.0}/src/testit_adapter_pytest.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testit-adapter-pytest
-Version: 2.8.3
+Version: 3.0.0
 Summary: Pytest adapter for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: attrs
-Requires-Dist: testit-python-commons==2.8.3
+Requires-Dist: testit-python-commons==3.0.0
 
 # Test IT TMS adapter for Pytest
 

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

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

testit-adapter-pytest-2.8.3/src/testit_adapter_pytest.egg-info/requires.txt

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