Merge pull request #177 from reportportal/no_failures_fix

No failures fix

Author: HardNorth

reportportal_client/client.py

@@ -17,7 +17,7 @@
 import logging
 
 import requests
-from requests.adapters import HTTPAdapter
+from requests.adapters import HTTPAdapter, Retry
 
 from ._local import set_current
 from .core.log_manager import LogManager
@@ -96,10 +96,15 @@ def __init__(self,
         self.step_reporter = StepReporter(self)
         self._item_stack = []
         if retries:
+            retry_strategy = Retry(
+                total=retries,
+                backoff_factor=0.1,
+                status_forcelist=[429, 500, 502, 503, 504]
+            )
             self.session.mount('https://', HTTPAdapter(
-                max_retries=retries, pool_maxsize=max_pool_size))
+                max_retries=retry_strategy, pool_maxsize=max_pool_size))
             self.session.mount('http://', HTTPAdapter(
-                max_retries=retries, pool_maxsize=max_pool_size))
+                max_retries=retry_strategy, pool_maxsize=max_pool_size))
         self.session.headers['Authorization'] = 'bearer {0}'.format(self.token)
 
         self._log_manager = LogManager(
@@ -119,6 +124,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,
@@ -127,7 +135,10 @@ def finish_launch(self,
             description=kwargs.get('description')
         ).payload
         response = HttpRequest(self.session.put, url=url, json=request_payload,
-                               verify_ssl=self.verify_ssl).make()
+                               verify_ssl=self.verify_ssl,
+                               name='Finish Launch').make()
+        if not response:
+            return
         logger.debug('finish_launch - ID: %s', self.launch_id)
         logger.debug('response message: %s', response.message)
         return response.message
@@ -156,9 +167,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,
@@ -172,7 +183,10 @@ def finish_test_item(self,
         ).payload
         response = HttpRequest(self.session.put, url=url, json=request_payload,
                                verify_ssl=self.verify_ssl).make()
-        self._item_stack.pop()
+        if not response:
+            return
+        # noinspection PyUnresolvedReferences
+        self._item_stack.pop() if len(self._item_stack) > 0 else None
         logger.debug('finish_test_item - ID: %s', item_id)
         logger.debug('response message: %s', response.message)
         return response.message
@@ -186,7 +200,7 @@ def get_item_id_by_uuid(self, uuid):
         url = uri_join(self.base_url_v1, 'item', 'uuid', uuid)
         response = HttpRequest(self.session.get, url=url,
                                verify_ssl=self.verify_ssl).make()
-        return response.id
+        return response.id if response else None
 
     def get_launch_info(self):
         """Get the current launch information.
@@ -199,6 +213,8 @@ def get_launch_info(self):
         logger.debug('get_launch_info - ID: %s', self.launch_id)
         response = HttpRequest(self.session.get, url=url,
                                verify_ssl=self.verify_ssl).make()
+        if not response:
+            return
         if response.is_success:
             launch_info = response.json
             logger.debug(
@@ -214,14 +230,17 @@ def get_launch_ui_id(self):
 
         :return: UI ID of the given launch. None if UI ID has not been found.
         """
-        return self.get_launch_info().get('id')
+        launch_info = self.get_launch_info()
+        return launch_info.get('id') if launch_info else None
 
     def get_launch_ui_url(self):
         """Get UI URL of the current launch.
 
         :return: launch URL or all launches URL.
         """
-        ui_id = self.get_launch_ui_id() or ''
+        ui_id = self.get_launch_ui_id()
+        if not ui_id:
+            return
         path = 'ui/#{0}/launches/all/{1}'.format(self.project, ui_id)
         url = uri_join(self.endpoint, path)
         logger.debug('get_launch_ui_url - ID: %s', self.launch_id)
@@ -235,7 +254,7 @@ def get_project_settings(self):
         url = uri_join(self.base_url_v1, 'settings')
         response = HttpRequest(self.session.get, url=url, json={},
                                verify_ssl=self.verify_ssl).make()
-        return response.json
+        return response.json if response else None
 
     def log(self, time, message, level=None, attachment=None, item_id=None):
         """Send log message to the Report Portal.
@@ -287,6 +306,8 @@ def start_launch(self,
                                url=url,
                                json=request_payload,
                                verify_ssl=self.verify_ssl).make()
+        if not response:
+            return
         self._log_manager.launch_id = self.launch_id = response.id
         logger.debug('start_launch - ID: %s', self.launch_id)
         return self.launch_id
@@ -324,6 +345,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:
@@ -346,9 +371,12 @@ def start_test_item(self,
                                url=url,
                                json=request_payload,
                                verify_ssl=self.verify_ssl).make()
+        if not response:
+            return
         item_id = response.id
         if item_id is not NOT_FOUND:
             logger.debug('start_test_item - ID: %s', item_id)
+            # noinspection PyUnresolvedReferences
             self._item_stack.append(item_id)
         else:
             logger.warning('start_test_item - invalid response: %s',
@@ -375,9 +403,12 @@ def update_test_item(self, item_uuid, attributes=None, description=None):
         url = uri_join(self.base_url_v1, 'item', item_id, 'update')
         response = HttpRequest(self.session.put, url=url, json=data,
                                verify_ssl=self.verify_ssl).make()
+        if not response:
+            return
         logger.debug('update_test_item - Item: %s', item_id)
         return response.message
 
     def current_item(self):
         """Retrieve the last item reported by the client."""
+        # noinspection PyUnresolvedReferences
         return self._item_stack[-1] if len(self._item_stack) > 0 else None

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_requests.py

@@ -20,6 +20,7 @@
 """
 
 import json
+import logging
 import uuid
 
 from reportportal_client.core.rp_file import RPFile
@@ -32,17 +33,19 @@
 from reportportal_client.static.defines import (
     DEFAULT_PRIORITY,
     LOW_PRIORITY,
-    RP_LOG_LEVELS,
-    SEND_RETRY_COUNT
+    RP_LOG_LEVELS
 )
 from .rp_responses import RPResponse
 
+logger = logging.getLogger(__name__)
+
 
 class HttpRequest:
     """This model stores attributes related to RP HTTP requests."""
 
     def __init__(self, session_method, url, data=None, json=None,
-                 files=None, verify_ssl=True, http_timeout=(10, 10)):
+                 files=None, verify_ssl=True, http_timeout=(10, 10),
+                 name=None):
         """Initialize instance attributes.
 
         :param session_method: Method of the requests.Session instance
@@ -54,6 +57,7 @@ def __init__(self, session_method, url, data=None, json=None,
         :param http_timeout:   a float in seconds for connect and read
                                timeout. Use a Tuple to specific connect and
                                read separately.
+        :param name:           request name
         """
         self.data = data
         self.files = files
@@ -62,20 +66,23 @@ def __init__(self, session_method, url, data=None, json=None,
         self.url = url
         self.verify_ssl = verify_ssl
         self.http_timeout = http_timeout
+        self.name = name
 
     def make(self):
         """Make HTTP request to the Report Portal API."""
-        for attempt in range(SEND_RETRY_COUNT):
-            try:
-                return RPResponse(self.session_method(
-                    self.url, data=self.data, json=self.json,
-                    files=self.files, verify=self.verify_ssl,
-                    timeout=self.http_timeout)
-                )
+        try:
+            return RPResponse(self.session_method(
+                self.url, data=self.data, json=self.json,
+                files=self.files, verify=self.verify_ssl,
+                timeout=self.http_timeout)
+            )
             # https://github.com/reportportal/client-Python/issues/39
-            except KeyError:
-                if attempt + 1 == SEND_RETRY_COUNT:
-                    raise
+        except (KeyError, IOError, ValueError) as exc:
+            logger.warning(
+                "Report Portal %s request failed",
+                self.name,
+                exc_info=exc
+            )
 
 
 class RPRequestBase(object):

reportportal_client/core/rp_requests.pyi

@@ -15,14 +15,16 @@ class HttpRequest:
     json: Optional[Dict] = ...
     verify_ssl: Optional[bool] = ...
     http_timeout: Union[float, Tuple[float, float]] = ...
+    name: Optional[Text] = ...
     def __init__(self,
                  session_method: Callable,
                  url: Text,
                  data = Optional[Union[Dict, List[Union[tuple, ByteString, IO]]]],
                  json = Optional[Dict],
                  files = Optional[Dict],
-                 verify_ssl = Optional[bool]) -> None: ...
-    def make(self) -> RPResponse: ...
+                 verify_ssl = Optional[bool],
+                 name = Optional[Text]) -> None: ...
+    def make(self) -> Optional[RPResponse]: ...
 
 
 class RPRequestBase(metaclass=AbstractBaseClass):

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):