Merge branch 'master' into items_sort

Author: iivanou

.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

README.rst

@@ -69,23 +69,23 @@ Example of :code:`pytest.ini`:
     rp_endpoint = http://192.168.1.10:8080
     rp_project = user_personal
     rp_launch = AnyLaunchName
-    rp_launch_tags = 'PyTest' 'Smoke'
+    rp_launch_attributes = 'PyTest' 'Smoke'
     rp_launch_description = 'Smoke test'
     rp_ignore_errors = True
-    rp_ignore_tags = 'xfail' 'usefixture'
+    rp_ignore_attributes = 'xfail' 'usefixture'
 
 The following parameters are optional:
 
 - :code:`rp_launch = AnyLaunchName` - launch name (could be overridden
   by pytest --rp-launch option, default value is 'Pytest Launch')
-- :code:`rp_launch_tags = 'PyTest' 'Smoke'` - list of tags for launch
-- :code:`rp_tests_tags = 'PyTest' 'Smoke'` - list of tags that will be added for each item in the launch
+- :code:`rp_launch_attributes = 'PyTest' 'Smoke'` - list of attributes for launch
+- :code:`rp_tests_attributes = 'PyTest' 'Smoke'` - list of attributes that will be added for each item in the launch
 - :code:`rp_launch_description = 'Smoke test'` - launch description (could be overridden
   by pytest --rp-launch-description option, default value is '')
 
 - :code:`rp_log_batch_size = 20` - size of batch log request
 - :code:`rp_ignore_errors = True` - Ignore Report Portal errors (exit otherwise)
-- :code:`rp_ignore_tags = 'xfail' 'usefixture'` - Ignore specified pytest markers
+- :code:`rp_ignore_attributes = 'xfail' 'usefixture'` - Ignore specified pytest markers
 - :code:`rp_hierarchy_dirs = True` - Enables hierarchy for tests directories, default `False`. Doesn't support 'xdist' plugin.
 - :code:`rp_hierarchy_module = True` - Enables hierarchy for module, default `True`. Doesn't support 'xdist' plugin.
 - :code:`rp_hierarchy_class = True` - Enables hierarchy for class, default `True`. Doesn't support 'xdist' plugin.
@@ -99,7 +99,7 @@ The following parameters are optional:
 
 
 If you like to override the above parameters from command line, or from CI environment based on your build, then pass
-- :code:`-o "rp_launch_tags=Smoke Tests"` during invocation.
+- :code:`-o "rp_launch_attributes=Smoke Tests"` during invocation.
 
 Examples
 ~~~~~~~~
@@ -174,8 +174,8 @@ Plugin can report doc-strings of tests as :code:`descriptions`:
         """
         pass
 
-Pytest markers will be attached as :code:`tags` to Report Portal items.
-In the following example tags 'linux' and 'win32' will be used:
+Pytest markers will be attached as :code:`attributes` to Report Portal items.
+In the following example attributes 'linux' and 'win32' will be used:
 
 .. code-block:: python
 
@@ -186,7 +186,7 @@ In the following example tags 'linux' and 'win32' will be used:
     def test_one():
         pass
 
-If you don't want to attach specific markers, list them in :code:`rp_ignore_tags` parameter
+If you don't want to attach specific markers, list them in :code:`rp_ignore_attributes` parameter
 
 
 Launching

pytest_reportportal/listener.py

@@ -32,12 +32,7 @@ def __init__(self, py_test_service,
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_runtest_protocol(self, item):
-        # Adding issues id marks to the test item
-        # if client doesn't support item updates
-        update_supported = self.PyTestService.is_item_update_supported()
-        if not update_supported:
-            self._add_issue_id_marks(item)
-
+        self._add_issue_id_marks(item)
         item_id = self.PyTestService.start_pytest_item(item)
         if PYTEST_HAS_LOGGING_PLUGIN:
             # This check can go away once we support pytest >= 3.3
@@ -47,11 +42,6 @@ def pytest_runtest_protocol(self, item):
                     yield
         else:
             yield
-        # Updating item in RP (tags and description)
-        # if client supports
-        if update_supported:
-            self._add_issue_id_marks(item)
-            self.PyTestService.update_pytest_item(item)
         # Finishing item in RP
         self.PyTestService.finish_pytest_item(
             item, item_id, self.result or 'SKIPPED', self.issue or None)
@@ -150,7 +140,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/plugin.py

@@ -55,14 +55,16 @@ def pytest_sessionstart(session):
             uuid=session.config.getini('rp_uuid'),
             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'),
+            ignored_attributes=session.config.getini('rp_ignore_attributes'),
             verify_ssl=session.config.getini('rp_verify_ssl'),
             retries=int(session.config.getini('retries')),
         )
 
+        attributes = [{'value': tag} for tag in
+                      session.config.getini('rp_launch_attributes')]
         session.config.py_test_service.start_launch(
             session.config.option.rp_launch,
-            tags=session.config.getini('rp_launch_tags'),
+            attributes=attributes,
             description=session.config.option.rp_launch_description
         )
         if session.config.pluginmanager.hasplugin('xdist'):
@@ -217,14 +219,14 @@ def pytest_addoption(parser):
         help='Launch name')
 
     parser.addini(
-        'rp_launch_tags',
+        'rp_launch_attributes',
         type='args',
-        help='Launch tags, i.e Performance Regression')
+        help='Launch attributes, i.e Performance Regression')
 
     parser.addini(
-        'rp_tests_tags',
+        'rp_tests_attributes',
         type='args',
-        help='Tags for all tests items, e.g. Smoke')
+        help='Attributes for all tests items, e.g. Smoke')
 
     parser.addini(
         'rp_launch_description',
@@ -243,7 +245,7 @@ def pytest_addoption(parser):
         help='Ignore Report Portal errors (exit otherwise)')
 
     parser.addini(
-        'rp_ignore_tags',
+        'rp_ignore_attributes',
         type='args',
         help='Ignore specified pytest markers, i.e parametrize')