handle KeyError on all service.py requests

reportportal_client/service.py

@@ -18,9 +18,11 @@
 import requests
 import uuid
 import logging
+import urllib3
 
 from .errors import ResponseError, EntryCreatedError, OperationCompletionError
 
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
@@ -144,7 +146,20 @@ 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)
+        from reportportal_client import POST_LOGBATCH_RETRY_COUNT
+        for i in range(POST_LOGBATCH_RETRY_COUNT):
+            try:
+                r = self.session.post(
+                    url=url,
+                    json=data,
+                    verify=self.verify_ssl
+                )
+            except KeyError:
+                if i < POST_LOGBATCH_RETRY_COUNT - 1:
+                    continue
+                else:
+                    raise
+            break
         self.launch_id = _get_id(r)
         self.stack.append(None)
         logger.debug("start_launch - Stack: %s", self.stack)
@@ -156,7 +171,20 @@ 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)
+        from reportportal_client import POST_LOGBATCH_RETRY_COUNT
+        for i in range(POST_LOGBATCH_RETRY_COUNT):
+            try:
+                r = self.session.put(
+                    url=url,
+                    json=data,
+                    verify=self.verify_ssl
+                )
+            except KeyError:
+                if i < POST_LOGBATCH_RETRY_COUNT - 1:
+                    continue
+                else:
+                    raise
+            break
         self.stack.pop()
         logger.debug("%s_launch - Stack: %s", action, self.stack)
         return _get_msg(r)
@@ -201,7 +229,20 @@ 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)
+        from reportportal_client import POST_LOGBATCH_RETRY_COUNT
+        for i in range(POST_LOGBATCH_RETRY_COUNT):
+            try:
+                r = self.session.post(
+                    url=url,
+                    json=data,
+                    verify=self.verify_ssl
+                )
+            except KeyError:
+                if i < POST_LOGBATCH_RETRY_COUNT - 1:
+                    continue
+                else:
+                    raise
+            break
 
         item_id = _get_id(r)
         self.stack.append(item_id)
@@ -221,13 +262,39 @@ 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)
+        from reportportal_client import POST_LOGBATCH_RETRY_COUNT
+        for i in range(POST_LOGBATCH_RETRY_COUNT):
+            try:
+                r = self.session.put(
+                    url=url,
+                    json=data,
+                    verify=self.verify_ssl
+                )
+            except KeyError:
+                if i < POST_LOGBATCH_RETRY_COUNT - 1:
+                    continue
+                else:
+                    raise
+            break
         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)
+        from reportportal_client import POST_LOGBATCH_RETRY_COUNT
+        for i in range(POST_LOGBATCH_RETRY_COUNT):
+            try:
+                r = self.session.get(
+                    url=url,
+                    json={},
+                    verify=self.verify_ssl
+                )
+            except KeyError:
+                if i < POST_LOGBATCH_RETRY_COUNT - 1:
+                    continue
+                else:
+                    raise
+            break
         logger.debug("settings - Stack: %s", self.stack)
         return _get_json(r)
 
@@ -243,7 +310,20 @@ 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)
+            from reportportal_client import POST_LOGBATCH_RETRY_COUNT
+            for i in range(POST_LOGBATCH_RETRY_COUNT):
+                try:
+                    r = self.session.post(
+                        url=url,
+                        json=data,
+                        verify=self.verify_ssl
+                    )
+                except KeyError:
+                    if i < POST_LOGBATCH_RETRY_COUNT - 1:
+                        continue
+                    else:
+                        raise
+                break
             logger.debug("log - Stack: %s", self.stack)
             return _get_id(r)