Add env var override for rp_uuid

Author: nbob31

.gitignore

@@ -13,6 +13,7 @@ dist/
 .installed.cfg
 *.egg
 MANIFEST
+.eggs
 
 # Installer logs
 pip-log.txt

README.rst

@@ -74,6 +74,8 @@ Example of :code:`pytest.ini`:
     rp_ignore_errors = True
     rp_ignore_attributes = 'xfail' 'usefixture'
 
+- The :code:`rp_uuid` can also be set with the environment variable `RP_UUID`. This will override the value set for :code:`rp_uuid` in pytest.ini
+
 The following parameters are optional:
 
 - :code:`rp_launch = AnyLaunchName` - launch name (could be overridden

pytest_reportportal/plugin.py

@@ -2,6 +2,7 @@
 # and/or modify it under the terms of the GPL licence
 
 import logging
+from os import getenv
 import dill as pickle
 import pkg_resources
 import pytest
@@ -52,7 +53,7 @@ def pytest_sessionstart(session):
         session.config.py_test_service.init_service(
             project=session.config.getini('rp_project'),
             endpoint=session.config.getini('rp_endpoint'),
-            uuid=session.config.getini('rp_uuid'),
+            uuid=getenv('RP_UUID') or 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_attributes=session.config.getini('rp_ignore_attributes'),
@@ -106,7 +107,7 @@ def pytest_configure(config):
 
     project = config.getini('rp_project')
     endpoint = config.getini('rp_endpoint')
-    uuid = config.getini('rp_uuid')
+    uuid = getenv('RP_UUID') or config.getini('rp_uuid')
     ignore_errors = config.getini('rp_ignore_errors')
     config._reportportal_configured = all([project, endpoint, uuid])
 

setup.py

@@ -8,7 +8,7 @@ def read_file(fname):
         return f.read()
 
 
-version = '5.0.3'
+version = '5.0.4'
 
 
 requirements = [

tests/test_plugin.py

@@ -1,13 +1,14 @@
 """This modules includes unit tests for the plugin."""
 
 from six.moves import mock
+import os
 
 from delayed_assert import expect, assert_expectations
 import pytest
 from requests.exceptions import RequestException
 
 from pytest_reportportal.listener import RPReportListener
-from pytest_reportportal.plugin import pytest_configure
+from pytest_reportportal.plugin import pytest_configure, pytest_sessionstart
 
 
 @mock.patch('pytest_reportportal.plugin.requests.get')
@@ -138,3 +139,18 @@ def iter_markers(name=None):
     expect(mocked_item.add_marker.call_args[0][0] == "issue:456823",
            "item.add_marker called with incorrect parameters")
     assert_expectations()
+
+
+@mock.patch.dict(os.environ, {'RP_UUID': 'foobar'})
+def test_uuid_env_var_override(mocked_session):
+    """
+    Test setting RP_UUID env variable overrides the rp_uuid config value
+    :param mocked_session: pytest fixture
+    """
+    mocked_session.config.py_test_service = mock.Mock()
+    mocked_session.config.option = mock.Mock()
+    mocked_session.config.pluginmanager = mock.Mock()
+    mocked_session.config.py_test_service.init_service = mock.Mock()
+    pytest_sessionstart(mocked_session)
+    args, kwargs = mocked_session.config.py_test_service.init_service.call_args
+    assert kwargs.get('uuid') == 'foobar'

tests/test_service.py

@@ -42,4 +42,3 @@ def test_get_item_parameters(rp_service):
     expect(rp_service._get_parameters(test_item) is None)
 
     assert_expectations()
-