Merge branch 'master' into fix-pytest-warning

Author: Dzmitry Humianiuk

README.rst

@@ -77,7 +77,7 @@ The following parameters are optional:
 - :code:`rp_hierarchy_parametrize = True` - Enables hierarchy parametrized tests, default `False`. Doesn't support 'xdist' plugin.
 - :code:`rp_hierarchy_dirs_level = 0` - Directory starting hierarchy level (from pytest.ini level) (default `0`)
 - :code:`rp_issue_marks = 'xfail' 'issue'` - Pytest marks that could be used to get issue information (id, type, reason)
-- :code:`rp_issue_system_url = https://bugzilla.olympus.f5net.com/show_bug.cgi?id=` - URL to get issue description (issue id from pytest mark will be added to this URL)
+- :code:`rp_issue_system_url = http://bugzilla.some.com/show_bug.cgi?id={%issue_id}` - issue URL (issue_id will be filled by parameter from pytest mark)
 - :code:`rp_verify_ssl = True` - Verify SSL when connecting to the server
 - :code:`rp_display_suite_test_file = True` In case of True, include the suite's relative file path in the launch name as a convention of "<RELATIVE_FILE_PATH>::<SUITE_NAME>". In case of False, set the launch name to be the suite name only - this flag is relevant only when "rp_hierarchy_module" flag is set to False
 

pytest_reportportal/listener.py

@@ -1,6 +1,9 @@
-import cgi
 import pytest
 import logging
+try:
+    from html import escape   # python3
+except ImportError:
+    from cgi import escape    # python2
 
 
 try:
@@ -46,8 +49,7 @@ def pytest_runtest_makereport(self, item):
 
         if report.longrepr:
             self.PyTestService.post_log(
-                # Used for support python 2.7
-                cgi.escape(report.longreprtext),
+                escape(report.longreprtext),
                 loglevel='ERROR',
             )
 
@@ -101,17 +103,17 @@ def _add_issue_info(self, item, report):
                         issue_ids = [issue_ids]
                     comment += "\n" if comment else ""
                     comment += "Issues:"
-
                     for issue_id in issue_ids:
-                        comment += " [{}]({}{})".format(issue_id, url, issue_id) if url else " {}".format(issue_id)
+                        template = (" [{issue_id}]" + "({})".format(url)) if url else " {issue_id}"
+                        comment += template.format(issue_id=issue_id)
 
                 if "issue_type" in mark.kwargs:
                     issue_type = mark.kwargs["issue_type"]
 
-        if comment:
-            self.issue['comment'] = comment
-
-        if issue_type and self.PyTestService.issue_types and (issue_type in self.PyTestService.issue_types):
+        if issue_type and self.PyTestService.issue_types \
+                and (issue_type in self.PyTestService.issue_types):
+            if comment:
+                self.issue['comment'] = comment
             self.issue['issue_type'] = self.PyTestService.issue_types[issue_type]
             # self.issue['ignoreAnalyzer'] = True ???
         elif (report.when == 'setup') and report.skipped:

pytest_reportportal/plugin.py

@@ -54,7 +54,8 @@ def pytest_sessionstart(session):
             log_batch_size=int(session.config.getini('rp_log_batch_size')),
             ignore_errors=bool(session.config.getini('rp_ignore_errors')),
             ignored_tags=session.config.getini('rp_ignore_tags'),
-            verify_ssl=session.config.getini('rp_verify_ssl')
+            verify_ssl=session.config.getini('rp_verify_ssl'),
+            retries=int(session.config.getini('retries')),
         )
 
         session.config.py_test_service.start_launch(
@@ -305,3 +306,8 @@ def pytest_addoption(parser):
         help="In case of True, include the suite's relative file path in the launch name as a convention of "
              "'<RELATIVE_FILE_PATH>::<SUITE_NAME>'. In case of False, set the launch name to be the suite name "
              "only - this flag is relevant only when 'rp_hierarchy_module' flag is set to False")
+
+    parser.addini(
+        'retries',
+        default='0',
+        help='Amount of retries for performing REST calls to RP server')

pytest_reportportal/rp_logging.py

@@ -44,7 +44,8 @@ def _log(self, level, msg, args,
             record = self.makeRecord(self.name, level, fn, lno, msg, args,
                                      exc_info, func, extra, sinfo)
 
-        record.attachment = attachment
+        if not record.attachment:
+            record.attachment = attachment
         self.handle(record)
 
 

pytest_reportportal/service.py

@@ -77,7 +77,8 @@ def __init__(self):
         self._item_parts = {}
 
     def init_service(self, endpoint, project, uuid, log_batch_size,
-                     ignore_errors, ignored_tags, verify_ssl=True):
+                     ignore_errors, ignored_tags, verify_ssl=True,
+                     retries=0):
         self._errors = queue.Queue()
         if self.RP is None:
             self.ignore_errors = ignore_errors
@@ -92,10 +93,14 @@ def init_service(self, endpoint, project, uuid, log_batch_size,
                 project=project,
                 token=uuid,
                 error_handler=self.async_error_handler,
+                retries=retries,
                 log_batch_size=log_batch_size  # ,
                 # verify_ssl=verify_ssl
             )
-            self.project_settiings = None  # self.RP.rp_client.get_project_settings() if self.RP else None
+            if self.RP and hasattr(self.RP.rp_client, "get_project_settings"):
+                self.project_settiings = self.RP.rp_client.get_project_settings()
+            else:
+                self.project_settiings = None
             self.issue_types = self.get_issue_types()
         else:
             log.debug('The pytest is already initialized')

setup.py

@@ -25,6 +25,7 @@ def read_file(fname):
     version=version,
     description='Agent for Reporting results of tests to the Report Portal',
     long_description=read_file('README.rst'),
+    long_description_content_type='text/markdown',
     author='Pavel Papou',
     author_email='[email protected]',
     url='https://github.com/reportportal/agent-python-pytest',