Merge pull request #209 from iivanou/key_value_attributes

Allow passing key/value attributes to RP

Author: HardNorth

README.rst

@@ -80,7 +80,7 @@ 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_attributes = 'PyTest' 'Smoke'` - list of attributes for launch
+- :code:`rp_launch_attributes = 'PyTest' 'Smoke' 'Env:Python3'` - 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 '')

pytest_reportportal/plugin.py

@@ -40,6 +40,29 @@ def is_master(config):
     return not hasattr(config, 'slaveinput')
 
 
+def get_launch_attributes(rp_launch_attributes):
+    """Generate list of launch attributes for RP.
+
+    :param list rp_launch_attributes: rp_launch_attributes option value
+    :return list:                     List of dictionaries to be passed to the
+                                      RP Python client
+    """
+    launch_attrs = []
+    for rp_attr in rp_launch_attributes:
+        try:
+            key, value = rp_attr.split(':')
+            attr_dict = {'key': key, 'value': value}
+        except ValueError:
+            attr_dict = {'value': rp_attr}
+
+        if all(value for value in attr_dict.values()):
+            launch_attrs.append(attr_dict)
+            continue
+        log.debug('Failed to process "{0}" attribute, attribute value'
+                  ' should not be empty.'.format(rp_attr))
+    return launch_attrs
+
+
 @pytest.mark.optionalhook
 def pytest_configure_node(node):
     """
@@ -78,8 +101,8 @@ def pytest_sessionstart(session):
             retries=int(session.config.getini('retries')),
         )
 
-        attributes = [{'value': tag} for tag in
-                      session.config.getini('rp_launch_attributes')]
+        attributes = get_launch_attributes(
+            session.config.getini('rp_launch_attributes'))
         session.config.py_test_service.start_launch(
             session.config.option.rp_launch,
             attributes=attributes,

tests/test_plugin.py

@@ -7,8 +7,11 @@
 import pytest
 from requests.exceptions import RequestException
 
-from pytest_reportportal.listener import RPReportListener
-from pytest_reportportal.plugin import pytest_configure, pytest_sessionstart
+from pytest_reportportal.plugin import (
+    get_launch_attributes,
+    pytest_configure,
+    pytest_sessionstart
+)
 
 
 @mock.patch('pytest_reportportal.plugin.requests.get')
@@ -71,3 +74,10 @@ def test_uuid_env_var_override(mocked_session):
     pytest_sessionstart(mocked_session)
     args, kwargs = mocked_session.config.py_test_service.init_service.call_args
     assert kwargs.get('uuid') == 'foobar'
+
+
+def test_get_launch_attributes():
+    """Test get_launch_attributes functionality."""
+    expected_out = [{'value': 'Tag'}, {'key': 'Key', 'value': 'Value'}]
+    out = get_launch_attributes(['Tag', 'Key:Value', ''])
+    assert expected_out == out