Merge pull request #196 from reportportal/develop

Release

Author: HardNorth

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 ## [Unreleased]
+### Fixed
+- Issue [#194](https://github.com/reportportal/client-Python/issues/194): logging URL generation, by @HardNorth
+- Issue [#195](https://github.com/reportportal/client-Python/issues/195): `None` mode exception
+
+## [5.2.4]
 ### Changed
 - `LogManager` class moved from `core` package to `logs` package, by @HardNorth
 ### Fixed

reportportal_client/client.py

@@ -310,11 +310,13 @@ def start_launch(self,
         # We are moving 'mode' param to the constructor, next code for the
         # transition period only.
         my_kwargs = dict(kwargs)
-        mode = my_kwargs.get('mode')
-        if not mode:
-            mode = self.mode
-        else:
+        if 'mode' in my_kwargs.keys():
+            mode = my_kwargs['mode']
             del my_kwargs['mode']
+            if not mode:
+                mode = self.mode
+        else:
+            mode = self.mode
 
         request_payload = LaunchStartRequest(
             name=name,

reportportal_client/logs/log_manager.py

@@ -69,7 +69,7 @@ def __init__(self, rp_url, session, api_version, launch_id, project_name,
 
         self._log_endpoint = (
             '{rp_url}/api/{version}/{project_name}/log'
-            .format(rp_url=rp_url, version=self.api_version,
+            .format(rp_url=rp_url.rstrip('/'), version=self.api_version,
                     project_name=self.project_name))
 
     def _send_batch(self):

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = '5.2.4'
+__version__ = '5.2.5'
 
 with open('requirements.txt') as f:
     requirements = f.read().splitlines()

tests/logs/test_log_manager.py

@@ -20,7 +20,7 @@
     MAX_LOG_BATCH_PAYLOAD_SIZE
 
 RP_URL = 'http://docker.local:8080'
-API_VERSION = 'api/v2'
+API_VERSION = 'v2'
 TEST_LAUNCH_ID = 'test_launch_id'
 TEST_ITEM_ID = 'test_item_id'
 PROJECT_NAME = 'test_project'
@@ -52,6 +52,26 @@ def test_log_batch_send_by_length():
     assert log_manager._payload_size == helpers.TYPICAL_MULTIPART_FOOTER_LENGTH
 
 
+# noinspection PyUnresolvedReferences
+def test_log_batch_send_url_format():
+    session = mock.Mock()
+    log_manager = LogManager(RP_URL + '/', session, API_VERSION,
+                             TEST_LAUNCH_ID,
+                             PROJECT_NAME, max_entry_number=TEST_BATCH_SIZE,
+                             verify_ssl=False)
+    log_manager._worker = mock.Mock()
+
+    for _ in range(TEST_BATCH_SIZE):
+        log_manager.log(helpers.timestamp(), TEST_MASSAGE, TEST_LEVEL,
+                        item_id=TEST_ITEM_ID)
+
+    assert log_manager._worker.send.call_count == 1
+    batch = log_manager._worker.send.call_args[0][0]
+    assert batch.http_request is not None
+    assert batch.http_request.url == \
+           RP_URL + '/api/' + API_VERSION + '/' + PROJECT_NAME + '/log'
+
+
 # noinspection PyUnresolvedReferences
 def test_log_batch_not_send_by_length():
     session = mock.Mock()