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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testit-adapter-pytest
-Version: 2.8.2
+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.2
+Requires-Dist: testit-python-commons==3.0.0
 
 # Test IT TMS adapter for Pytest
 

{testit-adapter-pytest-2.8.2 → 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.2',
+    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.2'],
+    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.2 → testit_adapter_pytest-3.0.0}/src/testit_adapter_pytest/listener.py

@@ -23,6 +23,42 @@ STATUS = {
 }
 
 
+class ItemCache:
+    def __init__(self):
+        self._items = dict()
+
+    def get(self, _id):
+        return self._items.get(id(_id))
+
+    def push(self, _id):
+        return self._items.setdefault(id(_id), uuid4())
+
+    def pop(self, _id):
+        return self._items.pop(id(_id), None)
+
+
+class SeparationOfTests:
+    def __init__(self):
+        self._selected_items = []
+        self._deselected_items = []
+
+    def add_item_to_selected_items(self, item):
+        self._selected_items.append(item)
+
+        return self
+
+    def add_item_to_deselected_items(self, item):
+        self._deselected_items.append(item)
+
+        return self
+
+    def get_selected_items(self) -> list:
+        return self._selected_items
+
+    def get_deselected_items(self) -> list:
+        return self._deselected_items
+
+
 class TmsListener(object):
     __executable_test = None
     __pytest_check_info = None
@@ -68,17 +104,16 @@ class TmsListener(object):
     def pytest_collection_modifyitems(self, config, items):
         self.__add_pytest_check_info(config.pluginmanager.list_plugin_distinfo())
 
-        deselected_items = []
         resolved_autotests = self.__adapter_manager.get_autotests_for_launch()
-        selected_items = self.__get_selected_items(items, resolved_autotests)
+        separation_of_tests = self.__get_separation_of_tests(items, resolved_autotests)
 
         if resolved_autotests:
-            if not selected_items:
+            if not separation_of_tests.get_selected_items():
                 print('The specified tests were not found!')
                 raise SystemExit
 
-            config.hook.pytest_deselected(items=deselected_items)
-            items[:] = selected_items
+            config.hook.pytest_deselected(items=separation_of_tests.get_deselected_items())
+            items[:] = separation_of_tests.get_selected_items()
 
     def __add_pytest_check_info(self, plugin_info):
         for plugin, dist in plugin_info:
@@ -88,15 +123,13 @@ class TmsListener(object):
 
     @classmethod
     @adapter_logger
-    def __get_selected_items(cls, items, resolved_autotests) -> list:
-        selected_items = []
+    def __get_separation_of_tests(cls, items, resolved_autotests) -> SeparationOfTests:
+        separation_of_tests = SeparationOfTests()
         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:
@@ -107,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
@@ -116,10 +149,12 @@ 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):
-                selected_items.append(item)
+            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)
 
-        return selected_items
+        return separation_of_tests
 
     @staticmethod
     @adapter_logger
@@ -128,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)
@@ -298,22 +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)
-
-
-class ItemCache:
-    def __init__(self):
-        self._items = dict()
-
-    def get(self, _id):
-        return self._items.get(id(_id))
-
-    def push(self, _id):
-        return self._items.setdefault(id(_id), uuid4())
-
-    def pop(self, _id):
-        return self._items.pop(id(_id), None)
+            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.2 → 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.2 → 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.2
+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.2
+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.2/src/testit_adapter_pytest.egg-info/requires.txt

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