* Cleanup code. Remove wrapper classes in favor of plain dicts.

* Add async client class which is now being used by default by pytest agent.
* Added automatic batch support of log messages.

Author: frizzby

pytest_reportportal/plugin.py

@@ -91,6 +91,10 @@ def pytest_configure(config):
 
 
 def pytest_unconfigure(config):
+    rp_launch = config.getoption("rp_launch")
+    if rp_launch:
+        PyTestService.terminate_service()
+
     if hasattr(config, "_reporter"):
         reporter = config._reporter
         del config._reporter

pytest_reportportal/service.py

@@ -1,9 +1,7 @@
 import logging
 from time import time
 from six import with_metaclass
-from reportportal_client import (
-    ReportPortalService, FinishExecutionRQ, StartLaunchRQ, StartTestItemRQ,
-    FinishTestItemRQ, SaveLogRQ)
+from reportportal_client import ReportPortalServiceAsync
 
 
 def timestamp():
@@ -26,45 +24,40 @@ class PyTestServiceClass(with_metaclass(Singleton, object)):
 
     def __init__(self):
         self.RP = None
-        self.TEST_ITEM_STACK = []
-        self.launch_id = None
 
     def init_service(self, endpoint, project, uuid):
-
         if self.RP is None:
             logging.debug(
                 msg="ReportPortal - Init service: "
                     "endpoint={0}, project={1}, uuid={2}".
                     format(endpoint, project, uuid))
-            self.RP = ReportPortalService(
+            self.RP = ReportPortalServiceAsync(
                 endpoint=endpoint,
                 project=project,
                 token=uuid)
         else:
             logging.debug("The pytest is already initialized")
         return self.RP
 
+    def terminate_service(self):
+        if self.RP is not None:
+            self.RP.terminate()
+
     def start_launch(
             self, launch_name=None, mode=None, tags=None, launch=None):
         # In next versions launch object(suite, testcase)
         # could be set as parameter
-        sl_pt = StartLaunchRQ(
+        sl_pt = dict(
             name=launch_name,
             start_time=timestamp(),
             description='Pytest Launch',
             mode=mode,
             tags=tags)
-        logging.debug(msg="ReportPortal - Start launch: "
-                          "request_body={0}".format(sl_pt.data))
-        req_data = self.RP.start_launch(sl_pt)
-        logging.debug(msg="ReportPortal - Launch started: "
-                          "response_body={0}".format(req_data.raw))
-        self.launch_id = req_data.id
-
-        self.TEST_ITEM_STACK.append((None, "SUITE"))
-        logging.debug(
-            msg="ReportPortal - Stack: {0}".
-                format(self.TEST_ITEM_STACK))
+        logging.debug("ReportPortal - Start launch: "
+                      "request_body={0}".format(sl_pt))
+        req_data = self.RP.start_launch(**sl_pt)
+        logging.debug("ReportPortal - Launch started: "
+                      "response_body={0}".format(req_data))
 
     def start_pytest_item(self, test_item=None):
         try:
@@ -73,78 +66,46 @@ def start_pytest_item(self, test_item=None):
         except AttributeError:
             # doctest  has no `function` attribute
             item_description = test_item.reportinfo()[2]
-        start_rq = StartTestItemRQ(
+        start_rq = dict(
             name=test_item.name,
             description=item_description,
             tags=['PyTest Item Tag'],
             start_time=timestamp(),
-            launch_id=self.launch_id,
             type="TEST")
 
-        parent_item_id = self._get_top_id_from_stack()
-
         logging.debug(
-            msg="ReportPortal - Start TestItem: "
-            "request_body={0}, parent_item={1}".format(
-                start_rq.data, parent_item_id))
-
-        req_data = self.RP.start_test_item(
-            parent_item_id=parent_item_id, start_test_item_rq=start_rq)
+            "ReportPortal - Start TestItem: "
+            "request_body={0}".format(start_rq))
 
-        self.TEST_ITEM_STACK.append((req_data.id, "TEST"))
-        logging.debug(
-            msg="ReportPortal - Stack: {0}".
-                format(self.TEST_ITEM_STACK))
+        self.RP.start_test_item(**start_rq)
 
     def finish_pytest_item(self, status, issue=None):
-        fta_rq = FinishTestItemRQ(end_time=timestamp(),
-                                  status=status,
-                                  issue=issue)
+        fta_rq = dict(end_time=timestamp(),
+                      status=status,
+                      issue=issue)
 
-        test_item_id = self._get_top_id_from_stack()
-        logging.debug(
-            msg="ReportPortal - Finish TetsItem:"
-                " request_body={0}, test_id={1}".
-                format(fta_rq.data, test_item_id))
-        self.RP.finish_test_item(
-            item_id=test_item_id,
-            finish_test_item_rq=fta_rq)
-        self.TEST_ITEM_STACK.pop()
         logging.debug(
-            msg="ReportPortal - Stack: {0}".
-                format(self.TEST_ITEM_STACK))
+            "ReportPortal - Finish TestItem:"
+            " request_body={0}".format(fta_rq))
+        self.RP.finish_test_item(**fta_rq)
 
     def finish_launch(self, launch=None, status="rp_launch"):
         # TO finish launch session str parameter is needed
-        fl_rq = FinishExecutionRQ(
+        fl_rq = dict(
             end_time=timestamp(),
             status=status)
-        launch_id = self.launch_id
         logging.debug(msg="ReportPortal - Finish launch: "
-                          "request_body={0}, launch_id={1}".format(fl_rq.data,
-                                                                   launch_id))
-        self.RP.finish_launch(launch_id, fl_rq)
-        self.TEST_ITEM_STACK.pop()
-        logging.debug(
-            msg="ReportPortal - Stack: {0}".
-                format(self.TEST_ITEM_STACK))
-
-    def _get_top_id_from_stack(self):
-        try:
-            return self.TEST_ITEM_STACK[-1][0]
-        except IndexError:
-            return None
+                          "request_body={0}".format(fl_rq))
+        self.RP.finish_launch(**fl_rq)
 
     def post_log(self, message, loglevel='INFO'):
         if loglevel not in self._loglevels:
             logging.warning('Incorrect loglevel = {}. Force set to INFO. Avaliable levels: '
                             '{}.'.format(loglevel, self._loglevels))
             loglevel = 'INFO'
 
-        sl_rq = SaveLogRQ(item_id=self._get_top_id_from_stack(),
-                          time=timestamp(), message=message,
-                          level=loglevel)
-        self.RP.log(sl_rq)
+        sl_rq = dict(time=timestamp(), message=message, level=loglevel)
+        self.RP.log(**sl_rq)
 
 
 PyTestService = PyTestServiceClass()