Fix reporting of launch attributes

Fix reporting of launch attributes

Author: iivanou

README.rst

@@ -69,23 +69,23 @@ Example of :code:`pytest.ini`:
     rp_endpoint = http://192.168.1.10:8080
     rp_project = user_personal
     rp_launch = AnyLaunchName
-    rp_launch_tags = 'PyTest' 'Smoke'
+    rp_launch_attributes = 'PyTest' 'Smoke'
     rp_launch_description = 'Smoke test'
     rp_ignore_errors = True
-    rp_ignore_tags = 'xfail' 'usefixture'
+    rp_ignore_attributes = 'xfail' 'usefixture'
 
 The following parameters are optional:
 
 - :code:`rp_launch = AnyLaunchName` - launch name (could be overridden
   by pytest --rp-launch option, default value is 'Pytest Launch')
-- :code:`rp_launch_tags = 'PyTest' 'Smoke'` - list of tags for launch
-- :code:`rp_tests_tags = 'PyTest' 'Smoke'` - list of tags that will be added for each item in the launch
+- :code:`rp_launch_attributes = 'PyTest' 'Smoke'` - list of attributes for launch
+- :code:`rp_tests_attributes = 'PyTest' 'Smoke'` - list of attributes that will be added for each item in the launch
 - :code:`rp_launch_description = 'Smoke test'` - launch description (could be overridden
   by pytest --rp-launch-description option, default value is '')
 
 - :code:`rp_log_batch_size = 20` - size of batch log request
 - :code:`rp_ignore_errors = True` - Ignore Report Portal errors (exit otherwise)
-- :code:`rp_ignore_tags = 'xfail' 'usefixture'` - Ignore specified pytest markers
+- :code:`rp_ignore_attributes = 'xfail' 'usefixture'` - Ignore specified pytest markers
 - :code:`rp_hierarchy_dirs = True` - Enables hierarchy for tests directories, default `False`. Doesn't support 'xdist' plugin.
 - :code:`rp_hierarchy_module = True` - Enables hierarchy for module, default `True`. Doesn't support 'xdist' plugin.
 - :code:`rp_hierarchy_class = True` - Enables hierarchy for class, default `True`. Doesn't support 'xdist' plugin.
@@ -99,7 +99,7 @@ The following parameters are optional:
 
 
 If you like to override the above parameters from command line, or from CI environment based on your build, then pass
-- :code:`-o "rp_launch_tags=Smoke Tests"` during invocation.
+- :code:`-o "rp_launch_attributes=Smoke Tests"` during invocation.
 
 Examples
 ~~~~~~~~
@@ -174,8 +174,8 @@ Plugin can report doc-strings of tests as :code:`descriptions`:
         """
         pass
 
-Pytest markers will be attached as :code:`tags` to Report Portal items.
-In the following example tags 'linux' and 'win32' will be used:
+Pytest markers will be attached as :code:`attributes` to Report Portal items.
+In the following example attributes 'linux' and 'win32' will be used:
 
 .. code-block:: python
 
@@ -186,7 +186,7 @@ In the following example tags 'linux' and 'win32' will be used:
     def test_one():
         pass
 
-If you don't want to attach specific markers, list them in :code:`rp_ignore_tags` parameter
+If you don't want to attach specific markers, list them in :code:`rp_ignore_attributes` parameter
 
 
 Launching

pytest_reportportal/plugin.py

@@ -55,14 +55,16 @@ def pytest_sessionstart(session):
             uuid=session.config.getini('rp_uuid'),
             log_batch_size=int(session.config.getini('rp_log_batch_size')),
             ignore_errors=bool(session.config.getini('rp_ignore_errors')),
-            ignored_tags=session.config.getini('rp_ignore_tags'),
+            ignored_attributes=session.config.getini('rp_ignore_attributes'),
             verify_ssl=session.config.getini('rp_verify_ssl'),
             retries=int(session.config.getini('retries')),
         )
 
+        attributes = [{'value': tag} for tag in
+                      session.config.getini('rp_launch_attributes')]
         session.config.py_test_service.start_launch(
             session.config.option.rp_launch,
-            tags=session.config.getini('rp_launch_tags'),
+            attributes=attributes,
             description=session.config.option.rp_launch_description
         )
         if session.config.pluginmanager.hasplugin('xdist'):
@@ -235,14 +237,14 @@ def pytest_addoption(parser):
         help='Launch name')
 
     parser.addini(
-        'rp_launch_tags',
+        'rp_launch_attributes',
         type='args',
-        help='Launch tags, i.e Performance Regression')
+        help='Launch attributes, i.e Performance Regression')
 
     parser.addini(
-        'rp_tests_tags',
+        'rp_tests_attributes',
         type='args',
-        help='Tags for all tests items, e.g. Smoke')
+        help='Attributes for all tests items, e.g. Smoke')
 
     parser.addini(
         'rp_launch_description',
@@ -261,7 +263,7 @@ def pytest_addoption(parser):
         help='Ignore Report Portal errors (exit otherwise)')
 
     parser.addini(
-        'rp_ignore_tags',
+        'rp_ignore_attributes',
         type='args',
         help='Ignore specified pytest markers, i.e parametrize')
 

pytest_reportportal/service.py

@@ -25,6 +25,7 @@
 from _pytest.unittest import TestCaseFunction, UnitTestCase
 
 from reportportal_client import ReportPortalService
+from reportportal_client.service import _dict_to_payload
 from six import with_metaclass
 from six.moves import queue
 
@@ -83,7 +84,7 @@ def __init__(self):
         self._item_parts = {}
         self._loglevels = ('TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR')
         self.ignore_errors = True
-        self.ignored_tags = []
+        self.ignored_attributes = []
         self.log_batch_size = 20
         self.log_item_id = None
         self.parent_item_id = None
@@ -112,17 +113,17 @@ def init_service(self,
                      uuid,
                      log_batch_size,
                      ignore_errors,
-                     ignored_tags,
+                     ignored_attributes,
                      verify_ssl=True,
                      retries=0):
         """Update self.rp with the instance of the ReportPortalService."""
         self._errors = queue.Queue()
         if self.rp is None:
             self.ignore_errors = ignore_errors
-            self.ignored_tags = ignored_tags
+            self.ignored_attributes = ignored_attributes
             if self.rp_supports_parameters:
-                self.ignored_tags = list(
-                    set(ignored_tags).union({'parametrize'}))
+                self.ignored_attributes = list(
+                    set(ignored_attributes).union({'parametrize'}))
             log.debug('ReportPortal - Init service: endpoint=%s, '
                       'project=%s, uuid=%s', endpoint, project, uuid)
             self.rp = ReportPortalService(
@@ -143,15 +144,14 @@ def start_launch(self,
                      launch_name,
                      mode=None,
                      description=None,
+                     attributes=None,
                      **kwargs):
         self._stop_if_necessary()
         if self.rp is None:
             return
 
-        system_info = self.rp.get_system_information(self._agent_name)
-        system_info['system'] = True
         sl_pt = {
-            'attributes': system_info,
+            'attributes': self._get_launch_attributes(attributes),
             'name': launch_name,
             'start_time': timestamp(),
             'description': description,
@@ -449,9 +449,22 @@ def _get_item_dirs(item):
 
         return dir_list
 
+    def _get_launch_attributes(self, ini_attrs):
+        """Generate launch attributes in the format supported by the client.
+
+        :param list ini_attrs: List for attributes from the pytest.ini file
+        """
+        attributes = ini_attrs or []
+
+        system_info = self.rp.get_system_information(self._agent_name)
+        system_info['system'] = True
+        system_attributes = _dict_to_payload(system_info)
+
+        return attributes + system_attributes
+
     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
+        # and exclude those which present in rp_ignore_attributes parameter
         def get_marker_value(item, keyword):
             try:
                 marker = item.get_closest_marker(keyword)
@@ -466,13 +479,13 @@ def get_marker_value(item, keyword):
             get_marker = getattr(item, "get_closest_marker")
         except AttributeError:
             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]
+        attributes = [{"value": get_marker_value(item, k)}
+                      for k in item.keywords if get_marker(k) is not None
+                      and k not in self.ignored_attributes]
 
-        tags.extend([{"value": tag}
-                     for tag in item.session.config.getini('rp_tests_tags')])
-        return tags
+        attributes.extend([{"value": tag} for tag in
+                           item.session.config.getini('rp_tests_attributes')])
+        return attributes
 
     def _get_parameters(self, item):
         return item.callspec.params if hasattr(item, 'callspec') else None

tests/test_service.py

@@ -6,12 +6,12 @@
 import pytest
 
 
-def test_item_tags(rp_service):
-    """Test that item tags are generated in a supported way."""
+def test_item_attributes(rp_service):
+    """Test that item attributes 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':
+        if option == 'rp_tests_attributes':
             return ['ini_marker']
 
     def get_closest_marker(name):