Support for markers with multiple values

Author: rambangaru

pytest_reportportal/service.py

@@ -635,17 +635,24 @@ def get_marker_value(item, keyword):
                 # pytest < 3.6
                 marker = item.keywords.get(keyword)
 
-            return "{}:{}".format(keyword, marker.args[0]) \
-                if marker and marker.args else keyword
+            marker_values = []
+            if marker and marker.args:
+                for arg in marker.args:
+                    marker_values.append("{}:{}".format(keyword, arg))
+            else:
+                marker_values.append(keyword)
+            # returns a list of strings to accommodate multiple values
+            return marker_values
 
         try:
             get_marker = getattr(item, "get_closest_marker")
         except AttributeError:
             get_marker = getattr(item, "get_marker")
 
-        raw_attrs = [get_marker_value(item, k)
-                     for k in item.keywords if get_marker(k) is not None
-                     and k not in self.ignored_attributes]
+        raw_attrs = []
+        for k in item.keywords:
+            if get_marker(k) is not None and k not in self.ignored_attributes:
+                raw_attrs.extend(get_marker_value(item, k))
         raw_attrs.extend(item.session.config.getini('rp_tests_attributes'))
         return gen_attributes(raw_attrs)
 

tests/test_service.py

@@ -17,14 +17,18 @@ def getini(option):
     def get_closest_marker(name):
         return {'test_marker': pytest.mark.test_marker,
                 'test_decorator_key':
-                    pytest.mark.test_decorator_key('test_decorator_value')
+                    pytest.mark.test_decorator_key('test_decorator_value'),
+                'test_decorator_key_with_multi_value':
+                    pytest.mark.test_decorator_key_with_multi_value(
+                        'test_value1', 'test_value2')
                 }.get(name)
 
     class NodeKeywords(object):
         _keywords = ['pytestmark',
                      'ini_marker',
                      'test_marker',
                      'test_decorator_key',
+                     'test_decorator_key_with_multi_value',
                      'test_ini_key']
 
         def __iter__(self):
@@ -37,6 +41,10 @@ def __iter__(self):
     assert markers == [{'value': 'test_marker'},
                        {'key': 'test_decorator_key',
                         'value': 'test_decorator_value'},
+                       {'key': 'test_decorator_key_with_multi_value',
+                        'value': 'test_value1'},
+                       {'key': 'test_decorator_key_with_multi_value',
+                        'value': 'test_value2'},
                        {'value': 'ini_marker'},
                        {'key': 'test_ini_key',
                         'value': 'test_ini_value'}]