Fix reporting of an issue marker.

Author: Ivan Ivanou

.travis.yml

@@ -5,9 +5,10 @@ stages:
 language: python
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
 script:
   - python setup.py test
   - python setup.py -q install

pytest_reportportal/listener.py

@@ -150,7 +150,7 @@ def _add_issue_info(self, item, report):
                 (issue_type in getattr(self.PyTestService, 'issue_types', ())):
             if comment:
                 self.issue['comment'] = comment
-            self.issue['issue_type'] = self.PyTestService.issue_types[issue_type]
+            self.issue['issueType'] = self.PyTestService.issue_types[issue_type]
             # self.issue['ignoreAnalyzer'] = True ???
         elif (report.when == 'setup') and report.skipped:
-            self.issue['issue_type'] = 'NOT_ISSUE'
+            self.issue['issueType'] = 'NOT_ISSUE'

pytest_reportportal/service.py

@@ -72,36 +72,57 @@ def __call__(cls, *args, **kwargs):
 
 
 class PyTestServiceClass(with_metaclass(Singleton, object)):
+    """Pytest service class for reporting test results to the Report Portal."""
 
     def __init__(self):
+        """Initialize instance attributes."""
+        self._agent_name = 'pytest-reportportal'
+        self._errors = queue.Queue()
+        self._hier_parts = {}
+        self._issue_types = {}
+        self._item_parts = {}
+        self._loglevels = ('TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR')
+        self.ignore_errors = True
+        self.ignored_tags = []
+        self.log_batch_size = 20
+        self.log_item_id = None
+        self.parent_item_id = None
         self.rp = None
         self.rp_supports_parameters = True
         try:
             pkg_resources.get_distribution('reportportal_client >= 3.2.0')
         except pkg_resources.VersionConflict:
             self.rp_supports_parameters = False
 
-        self.log_item_id = None
-        self.parent_item_id = None
-
-        self.ignore_errors = True
-        self.ignored_tags = []
-
-        self._errors = queue.Queue()
-        self._loglevels = ('TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR')
-        self._hier_parts = {}
-        self._item_parts = {}
-
-    def init_service(self, endpoint, project, uuid, log_batch_size,
-                     ignore_errors, ignored_tags, verify_ssl=True,
+    @property
+    def issue_types(self):
+        """Issue types for the Report Portal project."""
+        if not self._issue_types:
+            if not self.project_settings:
+                return self._issue_types
+            for item_type in ("AUTOMATION_BUG", "PRODUCT_BUG", "SYSTEM_ISSUE",
+                              "NO_DEFECT", "TO_INVESTIGATE"):
+                for item in self.project_settings["subTypes"][item_type]:
+                    self._issue_types[item["shortName"]] = item["locator"]
+        return self._issue_types
+
+    def init_service(self,
+                     endpoint,
+                     project,
+                     uuid,
+                     log_batch_size,
+                     ignore_errors,
+                     ignored_tags,
+                     verify_ssl=True,
                      retries=0):
+        """Update self.rp with the instance of the ReportPortalService."""
         self._errors = queue.Queue()
         if self.rp is None:
             self.ignore_errors = ignore_errors
+            self.ignored_tags = ignored_tags
             if self.rp_supports_parameters:
-                self.ignored_tags = list(set(ignored_tags).union({'parametrize'}))
-            else:
-                self.ignored_tags = ignored_tags
+                self.ignored_tags = list(
+                    set(ignored_tags).union({'parametrize'}))
             log.debug('ReportPortal - Init service: endpoint=%s, '
                       'project=%s, uuid=%s', endpoint, project, uuid)
             self.rp = ReportPortalService(
@@ -111,19 +132,13 @@ def init_service(self, endpoint, project, uuid, log_batch_size,
                 retries=retries,
                 verify_ssl=verify_ssl
             )
+            self.project_settings = None
             if self.rp and hasattr(self.rp, "get_project_settings"):
                 self.project_settings = self.rp.get_project_settings()
-            else:
-                self.project_settings = None
-            self.issue_types = self.get_issue_types()
         else:
             log.debug('The pytest is already initialized')
         return self.rp
 
-    def async_error_handler(self, exc_info):
-        self.rp = None
-        self._errors.put_nowait(exc_info)
-
     def start_launch(self,
                      launch_name,
                      mode=None,
@@ -133,7 +148,10 @@ def start_launch(self,
         if self.rp is None:
             return
 
+        system_info = self.rp.get_system_information(self._agent_name)
+        system_info['system'] = True
         sl_pt = {
+            'attributes': system_info,
             'name': launch_name,
             'start_time': timestamp(),
             'description': description,
@@ -281,8 +299,7 @@ def finish_pytest_item(self, test_item, item_id, status, issue=None):
         log.debug('ReportPortal - Finish TestItem: request_body=%s', fta_rq)
 
         parts = self._item_parts[test_item]
-        if not parts:
-            self.rp.finish_test_item(**fta_rq)
+        self.rp.finish_test_item(**fta_rq)
         while len(parts) > 0:
             part = parts.pop()
             if status == "FAILED":
@@ -323,12 +340,13 @@ def post_log(self, message, loglevel='INFO', attachment=None):
             loglevel = 'INFO'
 
         sl_rq = {
+            'item_id': self.log_item_id,
             'time': timestamp(),
             'message': message,
             'level': loglevel,
-            'attachment': attachment,
+            'attachment': attachment
         }
-        self.rp.log_batch((sl_rq,), item_id=self.log_item_id)
+        self.rp.log(**sl_rq)
 
     def _stop_if_necessary(self):
         try:
@@ -340,17 +358,6 @@ def _stop_if_necessary(self):
         except queue.Empty:
             pass
 
-    def get_issue_types(self):
-        issue_types = {}
-        if not self.project_settings:
-            return issue_types
-
-        for item_type in ("AUTOMATION_BUG", "PRODUCT_BUG", "SYSTEM_ISSUE", "NO_DEFECT", "TO_INVESTIGATE"):
-            for item in self.project_settings["subTypes"][item_type]:
-                issue_types[item["shortName"]] = item["locator"]
-
-        return issue_types
-
     @staticmethod
     def _add_item_hier_parts_dirs(item, hier_flag, dirs_level, report_parts, dirs_parts, rp_name=""):
 

setup.py

@@ -8,7 +8,7 @@ def read_file(fname):
         return f.read()
 
 
-version = '5.0.0'
+version = '5.0.1'
 
 
 requirements = [
@@ -34,9 +34,10 @@ def read_file(fname):
     classifiers=[
         'Framework :: Pytest',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6'
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8'
         ],
     entry_points={
         'pytest11': [

test_mocks.py

@@ -0,0 +1,4 @@
+"""This package contains unit tests for the project."""
+
+from six import add_move, MovedModule
+add_move(MovedModule('mock', 'mock', 'unittest.mock'))

tests/__init__.py

@@ -0,0 +1,56 @@
+"""This module contains common Pytest fixtures and hooks for unit tests."""
+
+from six.moves import mock
+
+from _pytest.config import Config
+from pytest import fixture
+
+from pytest_reportportal import RPLogger
+from pytest_reportportal.listener import RPReportListener
+from pytest_reportportal.service import PyTestServiceClass
+
+
+@fixture
+def logger():
+    """Prepare instance of the RPLogger for testing."""
+    return RPLogger('pytest_reportportal.test')
+
+
+@fixture()
+def mocked_item(mocked_session):
+    """Mock Pytest item for testing."""
+    test_item = mock.Mock()
+    test_item.session = mocked_session
+    return test_item
+
+
+@fixture()
+def mocked_config():
+    """Mock Pytest config for testing."""
+    mocked_config = mock.create_autospec(Config)
+    mocked_config._reportportal_configured = True
+    return mocked_config
+
+
+@fixture()
+def mocked_session(mocked_config):
+    """Mock Pytest session for testing."""
+    mocked_session = mock.Mock()
+    mocked_session.config = mocked_config
+    return mocked_session
+
+
+@fixture(scope='session')
+def rp_listener(rp_service):
+    """Prepare instance of the RPReportListener for testing."""
+    return RPReportListener(rp_service)
+
+
+@fixture(scope='session')
+def rp_service():
+    """Prepare instance of the PyTestServiceClass for testing."""
+    service = PyTestServiceClass()
+    with mock.patch('reportportal_client.service.'
+                    'ReportPortalService.get_project_settings'):
+        service.init_service("endpoint", "project", "uuid", 20, False, [])
+        return service