Client stability fixes

Author: HardNorth

reportportal_client/client.py

@@ -119,6 +119,9 @@ def finish_launch(self,
                             CANCELLED
         :param attributes:  Launch attributes
         """
+        if self.launch_id is NOT_FOUND or not self.launch_id:
+            logger.warning("Attempt to finish non-existent launch")
+            return
         url = uri_join(self.base_url_v2, 'launch', self.launch_id, 'finish')
         request_payload = LaunchFinishRequest(
             end_time,
@@ -159,9 +162,9 @@ def finish_test_item(self,
         :param retry:       Used to report retry of the test. Allowable values:
                            "True" or "False"
         """
-        if item_id is NOT_FOUND:
-            logger.warning("Uttempt to finish non-existent item")
-            return None
+        if item_id is NOT_FOUND or not item_id:
+            logger.warning("Attempt to finish non-existent item")
+            return
         url = uri_join(self.base_url_v2, 'item', item_id)
         request_payload = ItemFinishRequest(
             end_time,
@@ -337,6 +340,10 @@ def start_test_item(self,
                                values: "True" or "False"
         :param test_case_id: A unique ID of the current step
         """
+        if parent_item_id is NOT_FOUND:
+            logger.warning("Attempt to start item for non-existent parent "
+                           "item")
+            return
         if parent_item_id:
             url = uri_join(self.base_url_v2, 'item', parent_item_id)
         else:

reportportal_client/core/log_manager.py

@@ -24,6 +24,7 @@
     RPRequestLog
 )
 from reportportal_client.core.worker import APIWorker
+from reportportal_client.static.defines import NOT_FOUND
 
 logger = logging.getLogger(__name__)
 
@@ -91,6 +92,9 @@ def log(self, time, message=None, level=None, attachment=None,
         :param attachment:  Attachments(images,files,etc.)
         :param item_id:     parent item UUID
         """
+        if item_id is NOT_FOUND:
+            logger.warning("Attempt to log to non-existent item")
+            return
         rp_file = RPFile(**attachment) if attachment else None
         rp_log = RPRequestLog(self.launch_id, time, rp_file, item_id,
                               level, message)

reportportal_client/core/rp_responses.py

@@ -18,9 +18,11 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+import logging
 
 from reportportal_client.static.defines import NOT_FOUND
-from reportportal_client.static.errors import ResponseError
+
+logger = logging.getLogger(__name__)
 
 
 class RPMessage(object):
@@ -74,8 +76,10 @@ def _get_json(data):
         try:
             return data.json()
         except ValueError as error:
-            raise ResponseError('Invalid response: {0}: {1}'
-                                .format(error, data.text))
+            logger.warning('Invalid response: {0}: {1}'
+                           .format(error, data.text),
+                           exc_info=error)
+            return {}
 
     @property
     def id(self):

tests/test_client.py

@@ -12,33 +12,47 @@
 #  limitations under the License
 
 import pytest
-from reportportal_client.helpers import timestamp
+from requests import Response
 from requests.exceptions import ReadTimeout
 
+from reportportal_client.helpers import timestamp
+from reportportal_client.static.defines import NOT_FOUND
+
 
 def connection_error(*args, **kwargs):
     raise ReadTimeout()
 
 
+def response_error(*args, **kwargs):
+    result = Response()
+    result._content = '502 Gateway Timeout'.encode('ASCII')
+    result.status_code = 502
+    return result
+
+
 @pytest.mark.parametrize(
-    'requests_method, client_method, client_params',
+    'requests_method, client_method, client_params, expected_result',
     [
-        ('put', 'finish_launch', [timestamp()]),
-        ('put', 'finish_test_item', ['test_item_id', timestamp()]),
-        ('get', 'get_item_id_by_uuid', ['test_item_uuid']),
-        ('get', 'get_launch_info', []),
-        ('get', 'get_launch_ui_id', []),
-        ('get', 'get_launch_ui_url', []),
-        ('get', 'get_project_settings', []),
-        ('post', 'start_launch', ['Test Launch', timestamp()]),
-        ('post', 'start_test_item', ['Test Item', timestamp(), 'STEP']),
-        ('put', 'update_test_item', ['test_item_id'])
+        ('put', 'finish_launch', [timestamp()], NOT_FOUND),
+        ('put', 'finish_test_item', ['test_item_id', timestamp()], NOT_FOUND),
+        ('get', 'get_item_id_by_uuid', ['test_item_uuid'], NOT_FOUND),
+        ('get', 'get_launch_info', [], {}),
+        ('get', 'get_launch_ui_id', [], None),
+        ('get', 'get_launch_ui_url', [], None),
+        ('get', 'get_project_settings', [], {}),
+        ('post', 'start_launch', ['Test Launch', timestamp()], NOT_FOUND),
+        ('post', 'start_test_item', ['Test Item', timestamp(), 'STEP'],
+         NOT_FOUND),
+        ('put', 'update_test_item', ['test_item_id'], NOT_FOUND)
     ]
 )
 def test_connection_errors(rp_client, requests_method, client_method,
-                           client_params):
+                           client_params, expected_result):
     rp_client.launch_id = 'test_launch_id'
     getattr(rp_client.session, requests_method).side_effect = connection_error
     result = getattr(rp_client, client_method)(*client_params)
-
     assert result is None
+
+    getattr(rp_client.session, requests_method).side_effect = response_error
+    result = getattr(rp_client, client_method)(*client_params)
+    assert result == expected_result