Avoid raise condition in os.environ dict (TESTING IN PROGRESS)

reportportal_client/__init__.py

@@ -20,5 +20,3 @@
     ReportPortalService,
     ReportPortalServiceAsync,
 )
-
-POST_LOGBATCH_RETRY_COUNT = 10

reportportal_client/service.py

@@ -15,9 +15,9 @@
 
 import collections
 import json
-import requests
 import uuid
 import logging
+import requests
 
 from requests.adapters import HTTPAdapter
 
@@ -26,6 +26,8 @@
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
+HTTP_REQUEST_RETRY_COUNT = 10
+
 
 def _get_id(response):
     try:
@@ -65,8 +67,7 @@ def _get_json(response):
     try:
         if response.text:
             return response.json()
-        else:
-            return {}
+        return {}
     except ValueError as value_error:
         raise ResponseError(
             "Invalid response: {0}: {1}".format(value_error, response.text))
@@ -85,6 +86,23 @@ def _get_messages(data):
     return error_messages
 
 
+def _perform_reliably(request, **kwargs):
+    """Fix for https://github.com/reportportal/client-Python/issues/94.
+
+    Attempt to perform provided HTTP request with kwargs,
+    Ingore KeyError exception first HTTP_REQUEST_RETRY_COUNT times.
+    Return a response or propagate last exception
+        if HTTP_REQUEST_RETRY_COUNT exceeded.
+    """
+    to_raise = None
+    for _ in range(HTTP_REQUEST_RETRY_COUNT):
+        try:
+            return request(**kwargs)
+        except KeyError as e:
+            to_raise = e
+    raise to_raise
+
+
 def uri_join(*uri_parts):
     """Join uri parts.
 
@@ -149,7 +167,11 @@ def start_launch(self, name, start_time, description=None, tags=None,
             "mode": mode
         }
         url = uri_join(self.base_url, "launch")
-        r = self.session.post(url=url, json=data, verify=self.verify_ssl)
+        r = _perform_reliably(self.session.post,
+                              url=url,
+                              json=data,
+                              verify=self.verify_ssl)
+
         self.launch_id = _get_id(r)
         self.stack.append(None)
         logger.debug("start_launch - Stack: %s", self.stack)
@@ -161,7 +183,11 @@ def _finalize_launch(self, end_time, action, status):
             "status": status
         }
         url = uri_join(self.base_url, "launch", self.launch_id, action)
-        r = self.session.put(url=url, json=data, verify=self.verify_ssl)
+        r = _perform_reliably(self.session.put,
+                              url=url,
+                              json=data,
+                              verify=self.verify_ssl)
+
         self.stack.pop()
         logger.debug("%s_launch - Stack: %s", action, self.stack)
         return _get_msg(r)
@@ -206,7 +232,10 @@ def start_test_item(self, name, start_time, item_type, description=None,
             url = uri_join(self.base_url, "item", parent_item_id)
         else:
             url = uri_join(self.base_url, "item")
-        r = self.session.post(url=url, json=data, verify=self.verify_ssl)
+        r = _perform_reliably(self.session.post,
+                              url=url,
+                              json=data,
+                              verify=self.verify_ssl)
 
         item_id = _get_id(r)
         self.stack.append(item_id)
@@ -226,13 +255,21 @@ def finish_test_item(self, end_time, status, issue=None):
         }
         item_id = self.stack.pop()
         url = uri_join(self.base_url, "item", item_id)
-        r = self.session.put(url=url, json=data, verify=self.verify_ssl)
+        r = _perform_reliably(self.session.put,
+                              url=url,
+                              json=data,
+                              verify=self.verify_ssl)
+
         logger.debug("finish_test_item - Stack: %s", self.stack)
         return _get_msg(r)
 
     def get_project_settings(self):
         url = uri_join(self.base_url, "settings")
-        r = self.session.get(url=url, json={}, verify=self.verify_ssl)
+        r = _perform_reliably(self.session.get,
+                              url=url,
+                              json={},
+                              verify=self.verify_ssl)
+
         logger.debug("settings - Stack: %s", self.stack)
         return _get_json(r)
 
@@ -248,7 +285,11 @@ def log(self, time, message, level=None, attachment=None):
             return self.log_batch([data])
         else:
             url = uri_join(self.base_url, "log")
-            r = self.session.post(url=url, json=data, verify=self.verify_ssl)
+            r = _perform_reliably(self.session.post,
+                                  url=url,
+                                  json=data,
+                                  verify=self.verify_ssl)
+
             logger.debug("log - Stack: %s", self.stack)
             return _get_id(r)
 
@@ -296,20 +337,10 @@ def log_batch(self, log_data):
             )
         )]
         files.extend(attachments)
-        from reportportal_client import POST_LOGBATCH_RETRY_COUNT
-        for i in range(POST_LOGBATCH_RETRY_COUNT):
-            try:
-                r = self.session.post(
-                    url=url,
-                    files=files,
-                    verify=self.verify_ssl
-                )
-            except KeyError:
-                if i < POST_LOGBATCH_RETRY_COUNT - 1:
-                    continue
-                else:
-                    raise
-            break
+        r = _perform_reliably(self.session.post,
+                              url=url,
+                              files=files,
+                              verify=self.verify_ssl)
 
         logger.debug("log_batch - Stack: %s", self.stack)
         logger.debug("log_batch response: %s", r.text)