Merge pull request #22 from frizzby/master

Do not fail if Report Portal is unreachable

Author: krasoffski

README.rst

@@ -48,6 +48,7 @@ Example of :code:`pytest.ini`:
     rp_launch = AnyLaunchName
     rp_launch_tags = 'PyTest' 'Smoke'
     rp_launch_description = 'Smoke test'
+    rp_ignore_errors = True
 
 The following parapmeters are optional:
 
@@ -56,6 +57,7 @@ The following parapmeters are optional:
 - :code:`rp_launch_tags = 'PyTest' 'Smoke'` - list of tags
 - :code:`rp_launch_description = 'Smoke test'` - launch description
 - :code:`rp_log_batch_size = 20` - size of batch log request
+- :code:`rp_ignore_errors = True` - Ignore Report Portal errors (exit otherwise)
 
 
 Examples

pytest_reportportal/plugin.py

@@ -61,7 +61,8 @@ def pytest_sessionstart(session):
         project=session.config.getini("rp_project"),
         endpoint=session.config.getini("rp_endpoint"),
         uuid=session.config.getini("rp_uuid"),
-        log_batch_size=int(session.config.getini("rp_log_batch_size"))
+        log_batch_size=int(session.config.getini("rp_log_batch_size")),
+        ignore_errors=bool(session.config.getini("rp_ignore_errors")),
     )
 
     PyTestService.start_launch(
@@ -137,3 +138,9 @@ def pytest_addoption(parser):
         "rp_log_batch_size",
         default="20",
         help="Size of batch log requests in async mode")
+
+    parser.addini(
+        "rp_ignore_errors",
+        default=False,
+        type="bool",
+        help="Ignore Report Portal errors (exit otherwise)")

pytest_reportportal/service.py

@@ -2,16 +2,13 @@
 import traceback
 from time import time
 
+import pytest
 from six import with_metaclass
+from six.moves import queue
 
 from reportportal_client import ReportPortalServiceAsync
 
 
-def async_error_handler(exc_info):
-    exc, msg, tb = exc_info
-    traceback.print_exception(exc, msg, tb)
-
-
 def timestamp():
     return str(int(time() * 1000))
 
@@ -32,9 +29,14 @@ class PyTestServiceClass(with_metaclass(Singleton, object)):
 
     def __init__(self):
         self.RP = None
+        self.ignore_errors = True
+        self._errors = queue.Queue()
 
-    def init_service(self, endpoint, project, uuid, log_batch_size):
+    def init_service(self, endpoint, project, uuid, log_batch_size,
+                     ignore_errors):
+        self._errors = queue.Queue()
         if self.RP is None:
+            self.ignore_errors = ignore_errors
             logging.debug(
                 msg="ReportPortal - Init service: "
                     "endpoint={0}, project={1}, uuid={2}".
@@ -43,18 +45,37 @@ def init_service(self, endpoint, project, uuid, log_batch_size):
                 endpoint=endpoint,
                 project=project,
                 token=uuid,
-                error_handler=async_error_handler,
-                log_batch_size=log_batch_size)
+                error_handler=self.async_error_handler,
+                log_batch_size=log_batch_size
+            )
         else:
             logging.debug("The pytest is already initialized")
         return self.RP
 
+    def async_error_handler(self, exc_info):
+        self.terminate_service()
+        self.RP = None
+        self._errors.put_nowait(exc_info)
+
+    def _stop_if_neccessary(self):
+        try:
+            exc, msg, tb = self._errors.get(False)
+            traceback.print_exception(exc, msg, tb)
+            if not self.ignore_errors:
+                pytest.exit(msg)
+        except queue.Empty:
+            pass
+
     def terminate_service(self):
         if self.RP is not None:
             self.RP.terminate()
 
     def start_launch(
             self, launch_name, mode=None, tags=None, description=None):
+        self._stop_if_neccessary()
+        if self.RP is None:
+            return
+
         sl_pt = {
             "name": launch_name,
             "start_time": timestamp(),
@@ -69,6 +90,10 @@ def start_launch(
                       "response_body=%s", req_data)
 
     def start_pytest_item(self, test_item=None):
+        self._stop_if_neccessary()
+        if self.RP is None:
+            return
+
         start_rq = {
             "name": self._get_full_name(test_item),
             "description": self._get_description(test_item),
@@ -104,6 +129,10 @@ def _get_tags(self, test_item):
             return []
 
     def finish_pytest_item(self, status, issue=None):
+        self._stop_if_neccessary()
+        if self.RP is None:
+            return
+
         fta_rq = {
             "end_time": timestamp(),
             "status": status,
@@ -116,6 +145,10 @@ def finish_pytest_item(self, status, issue=None):
         self.RP.finish_test_item(**fta_rq)
 
     def finish_launch(self, launch=None, status="rp_launch"):
+        self._stop_if_neccessary()
+        if self.RP is None:
+            return
+
         # To finish launch session str parameter is needed
         fl_rq = {
             "end_time": timestamp(),
@@ -126,6 +159,10 @@ def finish_launch(self, launch=None, status="rp_launch"):
         self.RP.finish_launch(**fl_rq)
 
     def post_log(self, message, loglevel='INFO', attachment=None):
+        self._stop_if_neccessary()
+        if self.RP is None:
+            return
+
         if loglevel not in self._loglevels:
             logging.warning('Incorrect loglevel = %s. Force set to INFO. '
                             'Avaliable levels: %s.', loglevel, self._loglevels)