Fix tests

Author: HardNorth

pytest_reportportal/config.py

@@ -164,7 +164,7 @@ def __init__(self, pytest_config: Config) -> None:
             pytest_config, 'rp_launch_uuid_print'
         ) or 'False'))
         print_output = self.find_option(pytest_config, 'rp_launch_uuid_print_output')
-        self.rp_launch_uuid_print_output = OutputType[print_output] if print_output else None
+        self.rp_launch_uuid_print_output = OutputType[print_output.upper()] if print_output else None
         client_type = self.find_option(pytest_config, 'rp_client_type')
         self.rp_client_type = ClientType[client_type.upper()] if client_type else ClientType.SYNC
 

pytest_reportportal/plugin.py

@@ -23,7 +23,7 @@
 import requests
 from reportportal_client import RPLogHandler
 from reportportal_client.errors import ResponseError
-from reportportal_client.logs.log_manager import MAX_LOG_BATCH_PAYLOAD_SIZE
+from reportportal_client.logs import MAX_LOG_BATCH_PAYLOAD_SIZE
 
 from pytest_reportportal import LAUNCH_WAIT_TIMEOUT
 from .config import AgentConfig
@@ -402,13 +402,11 @@ def add_shared_option(name, help_str, default=None, action='store'):
     )
     add_shared_option(
         name='rp_launch_uuid_print',
-        help_str='Enables printing Launch UUID on test run start. Possible values: [True, False]',
-        default='False'
+        help_str='Enables printing Launch UUID on test run start. Possible values: [True, False]'
     )
     add_shared_option(
         name='rp_launch_uuid_print_output',
-        help_str='Launch UUID print output. Default `stdout`. Possible values: [stderr, stdout]',
-        default='stdout'
+        help_str='Launch UUID print output. Default `stdout`. Possible values: [stderr, stdout]'
     )
 
     parser.addini(
@@ -500,3 +498,8 @@ def add_shared_option(name, help_str, default=None, action='store'):
         help='Maximum time to wait for child processes finish, default value: '
              '86400 seconds (1 day)'
     )
+    parser.addini(
+        'rp_client_type',
+        help='Type of the under-the-hood ReportPortal client implementation. Possible values: [SYNC, ASYNC_THREAD, '
+             'ASYNC_BATCHED]'
+    )

tests/__init__.py

@@ -14,6 +14,4 @@
 limitations under the License
 """
 
-REPORT_PORTAL_PACKAGE = 'pytest_reportportal'
-
-REPORT_PORTAL_SERVICE = REPORT_PORTAL_PACKAGE + '.service.RPClient'
+REPORT_PORTAL_SERVICE = 'reportportal_client.RPClient'

tests/helpers/utils.py

@@ -138,7 +138,7 @@ def attributes_to_tuples(attributes):
 # noinspection PyProtectedMember
 def run_tests_with_client(client, tests, args=None, variables=None):
     def test_func():
-        from reportportal_client._local import set_current
+        from reportportal_client import set_current
         set_current(client)
         return run_pytest_tests(tests, args, variables)
 

tests/integration/test_config_handling.py

@@ -15,12 +15,12 @@
 import sys
 import warnings
 from io import StringIO
+from unittest import mock
 
 from delayed_assert import expect, assert_expectations
-from unittest import mock
 
+from reportportal_client import OutputType
 from examples.test_rp_logging import LOG_MESSAGE
-from pytest_reportportal.config import OUTPUT_TYPES
 from tests import REPORT_PORTAL_SERVICE
 from tests.helpers import utils
 
@@ -285,20 +285,11 @@ def test_launch_uuid_print(mock_client_init):
     print_uuid = True
     variables = utils.DEFAULT_VARIABLES.copy()
     variables.update({'rp_launch_uuid_print': str(print_uuid)}.items())
-
-    str_io = StringIO()
-    stdout = sys.stdout
-    try:
-        OUTPUT_TYPES['stdout'] = str_io
-        result = utils.run_pytest_tests(['examples/test_rp_logging.py'],
-                                        variables=variables)
-    finally:
-        OUTPUT_TYPES['stdout'] = stdout
-
+    result = utils.run_pytest_tests(['examples/test_rp_logging.py'], variables=variables)
     assert int(result) == 0, 'Exit code should be 0 (no errors)'
     expect(mock_client_init.call_count == 1)
     expect(mock_client_init.call_args_list[0][1]['launch_uuid_print'] == print_uuid)
-    expect(mock_client_init.call_args_list[0][1]['print_output'] is str_io)
+    expect(mock_client_init.call_args_list[0][1]['print_output'] is None)
     assert_expectations()
 
 
@@ -307,20 +298,11 @@ def test_launch_uuid_print_stderr(mock_client_init):
     print_uuid = True
     variables = utils.DEFAULT_VARIABLES.copy()
     variables.update({'rp_launch_uuid_print': str(print_uuid), 'rp_launch_uuid_print_output': 'stderr'}.items())
-
-    str_io = StringIO()
-    stderr = sys.stderr
-    try:
-        OUTPUT_TYPES['stderr'] = str_io
-        result = utils.run_pytest_tests(['examples/test_rp_logging.py'],
-                                        variables=variables)
-    finally:
-        OUTPUT_TYPES['stderr'] = stderr
-
+    result = utils.run_pytest_tests(['examples/test_rp_logging.py'], variables=variables)
     assert int(result) == 0, 'Exit code should be 0 (no errors)'
     expect(mock_client_init.call_count == 1)
     expect(mock_client_init.call_args_list[0][1]['launch_uuid_print'] == print_uuid)
-    expect(mock_client_init.call_args_list[0][1]['print_output'] is str_io)
+    expect(mock_client_init.call_args_list[0][1]['print_output'] is OutputType.STDERR)
     assert_expectations()
 
 
@@ -329,38 +311,17 @@ def test_launch_uuid_print_invalid_output(mock_client_init):
     print_uuid = True
     variables = utils.DEFAULT_VARIABLES.copy()
     variables.update({'rp_launch_uuid_print': str(print_uuid), 'rp_launch_uuid_print_output': 'something'}.items())
-
-    str_io = StringIO()
-    stdout = sys.stdout
-    try:
-        OUTPUT_TYPES['stdout'] = str_io
-        result = utils.run_pytest_tests(['examples/test_rp_logging.py'],
-                                        variables=variables)
-    finally:
-        OUTPUT_TYPES['stdout'] = stdout
-
-    assert int(result) == 0, 'Exit code should be 0 (no errors)'
-    expect(mock_client_init.call_count == 1)
-    expect(mock_client_init.call_args_list[0][1]['launch_uuid_print'] == print_uuid)
-    expect(mock_client_init.call_args_list[0][1]['print_output'] is str_io)
-    assert_expectations()
+    result = utils.run_pytest_tests(['examples/test_rp_logging.py'], variables=variables)
+    assert int(result) == 3, 'Exit code should be 3 (INTERNALERROR)'
+    assert mock_client_init.call_count == 0
 
 
 @mock.patch(REPORT_PORTAL_SERVICE)
 def test_no_launch_uuid_print(mock_client_init):
     variables = utils.DEFAULT_VARIABLES.copy()
-
-    str_io = StringIO()
-    stdout = sys.stdout
-    try:
-        OUTPUT_TYPES['stdout'] = str_io
-        result = utils.run_pytest_tests(['examples/test_rp_logging.py'],
-                                        variables=variables)
-    finally:
-        OUTPUT_TYPES['stdout'] = stdout
-
+    result = utils.run_pytest_tests(['examples/test_rp_logging.py'], variables=variables)
     assert int(result) == 0, 'Exit code should be 0 (no errors)'
     expect(mock_client_init.call_count == 1)
     expect(mock_client_init.call_args_list[0][1]['launch_uuid_print'] is False)
-    expect(mock_client_init.call_args_list[0][1]['print_output'] is str_io)
+    expect(mock_client_init.call_args_list[0][1]['print_output'] is None)
     assert_expectations()