Update item tags through the attributes

Author: iivanou

pytest_reportportal/listener.py

@@ -32,12 +32,7 @@ def __init__(self, py_test_service,
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_runtest_protocol(self, item):
-        # Adding issues id marks to the test item
-        # if client doesn't support item updates
-        update_supported = self.PyTestService.is_item_update_supported()
-        if not update_supported:
-            self._add_issue_id_marks(item)
-
+        self._add_issue_id_marks(item)
         item_id = self.PyTestService.start_pytest_item(item)
         if PYTEST_HAS_LOGGING_PLUGIN:
             # This check can go away once we support pytest >= 3.3
@@ -47,11 +42,6 @@ def pytest_runtest_protocol(self, item):
                     yield
         else:
             yield
-        # Updating item in RP (tags and description)
-        # if client supports
-        if update_supported:
-            self._add_issue_id_marks(item)
-            self.PyTestService.update_pytest_item(item)
         # Finishing item in RP
         self.PyTestService.finish_pytest_item(
             item, item_id, self.result or 'SKIPPED', self.issue or None)

pytest_reportportal/service.py

@@ -245,6 +245,7 @@ def start_pytest_item(self, test_item=None):
             self._hier_parts[part]["item_id"] = item_id
 
         start_rq = {
+            'attributes': self._get_item_markers(test_item),
             'name': self._get_item_name(test_item),
             'description': self._get_item_description(test_item),
             'start_time': timestamp(),
@@ -259,31 +260,6 @@ def start_pytest_item(self, test_item=None):
         self.log_item_id = item_id
         return item_id
 
-    def is_item_update_supported(self):
-        """Check item update API call client support."""
-        return hasattr(self.rp, "update_test_item")
-
-    def update_pytest_item(self, test_item=None):
-        """Make item update API call.
-
-        :param test_item: pytest test item
-        """
-        self._stop_if_necessary()
-        if self.rp is None:
-            return
-
-        # if update_test_item is not supported in client
-        if not self.is_item_update_supported():
-            log.debug('ReportPortal - Update TestItem: method is not defined')
-            return
-
-        start_rq = {
-            'description': self._get_item_description(test_item),
-            'tags': self._get_item_tags(test_item),
-        }
-        log.debug('ReportPortal - Update TestItem: request_body=%s', start_rq)
-        self.rp.update_test_item(**start_rq)
-
     def finish_pytest_item(self, test_item, item_id, status, issue=None):
         self._stop_if_necessary()
         if self.rp is None:
@@ -473,7 +449,7 @@ def _get_item_dirs(item):
 
         return dir_list
 
-    def _get_item_tags(self, item):
+    def _get_item_markers(self, item):
         # Try to extract names of @pytest.mark.* decorators used for test item
         # and exclude those which present in rp_ignore_tags parameter
         def get_marker_value(item, keyword):
@@ -487,17 +463,15 @@ def get_marker_value(item, keyword):
                 if marker and marker.args else keyword
 
         try:
-            tags = [get_marker_value(item, k) for k in item.keywords
-                    if item.get_closest_marker(k) is not None
-                    and k not in self.ignored_tags]
+            get_marker = getattr(item, "get_closest_marker")
         except AttributeError:
-            # pytest < 3.6
-            tags = [get_marker_value(item, k) for k in item.keywords
-                    if item.get_marker(k) is not None
-                    and k not in self.ignored_tags]
-
-        tags.extend(item.session.config.getini('rp_tests_tags'))
+            get_marker = getattr(item, "get_marker")
+        tags = [{"value": get_marker_value(item, k)}
+                for k in item.keywords if get_marker(k) is not None
+                and k not in self.ignored_tags]
 
+        tags.extend([{"value": tag}
+                     for tag in item.session.config.getini('rp_tests_tags')])
         return tags
 
     def _get_parameters(self, item):

setup.py

@@ -12,7 +12,7 @@ def read_file(fname):
 
 
 requirements = [
-    'reportportal-client~=5.0.0',
+    'reportportal-client>=5.0.2',
     'pytest>=3.0.7',
     'six>=1.10.0',
     'dill>=0.2.7.1',

tests/conftest.py

@@ -40,13 +40,13 @@ def mocked_session(mocked_config):
     return mocked_session
 
 
-@fixture(scope='session')
+@fixture()
 def rp_listener(rp_service):
     """Prepare instance of the RPReportListener for testing."""
     return RPReportListener(rp_service)
 
 
-@fixture(scope='session')
+@fixture()
 def rp_service():
     """Prepare instance of the PyTestServiceClass for testing."""
     service = PyTestServiceClass()

tests/test_plugin.py

@@ -74,30 +74,6 @@ def test_pytest_runtest_protocol(mocked_item):
     assert_expectations()
 
 
-def test_is_item_update_supported(rp_service):
-    """Test listener public is_client_support_item_update method.
-
-    :param rp_service: Pytest fixture
-    """
-    func = None
-
-    if hasattr(rp_service.rp, 'update_test_item'):
-        func = rp_service.rp.update_test_item
-        delattr(type(rp_service.rp), 'update_test_item')
-
-    result = rp_service.is_item_update_supported()
-    expect(result is False,
-           "incorrect result for is_client_support_item_update method")
-
-    rp_service.rp.update_test_item = func
-    setattr(rp_service.rp, 'update_test_item', mock.Mock())
-
-    result = rp_service.is_item_update_supported()
-    expect(result is True,
-           'incorrect result for is_client_support_item_update method')
-    assert_expectations()
-
-
 def test_add_issue_info(rp_listener, rp_service):
     """Test listener helper _add_issue_info method.
 

tests/test_service.py

@@ -0,0 +1,30 @@
+"""This modules includes unit tests for the service.py module."""
+
+from six.moves import mock
+
+import pytest
+
+
+def test_item_tags(rp_service):
+    """Test that item tags are generated in a supported way."""
+    rp_service.is_item_update_supported = mock.Mock(return_value=False)
+
+    def getini(option):
+        if option == 'rp_tests_tags':
+            return ['ini_marker']
+
+    def get_closest_marker(name):
+        return {'test_marker': pytest.mark.test_marker}.get(name)
+
+    class NodeKeywords(object):
+        _keywords = ['pytestmark', 'ini_marker', 'test_marker']
+
+        def __iter__(self):
+            return iter(self._keywords)
+
+    test_item = mock.Mock()
+    test_item.session.config.getini = getini
+    test_item.keywords = NodeKeywords()
+    test_item.get_closest_marker = get_closest_marker
+    markers = rp_service._get_item_markers(test_item)
+    assert markers == [{'value': 'test_marker'}, {'value': 'ini_marker'}]