attach from parametrized test (fixes allure-framework#101 via allure-framework#133)

sseliverstov · web-flow · commit 89e71617af05 · 2017-08-05T04:06:46.000+03:00
diff --git a/allure-pytest/test/attachments/attachments_in_parametrized_test.py b/allure-pytest/test/attachments/attachments_in_parametrized_test.py
@@ -0,0 +1,28 @@
+"""
+>>> allure_report = getfixture('allure_report')
+>>> assert_that(allure_report,
+...             all_of(
+...                 has_property('test_cases', has_length(9)),
+...                 has_property('test_groups', has_length(0)),
+...                 has_property('attachments', has_length(11))
+...             ))  # doctest: +SKIP
+"""
+
+import allure
+import pytest
+
+BODY = ['I Like to', 'Move It']
+
+
+@pytest.mark.parametrize('attachment', BODY)
+def test_attach_data_from_parametrized_test(attachment):
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> for body in BODY:
+    ...     assert_that(allure_report,
+    ...                 has_test_case('test_attach_data_from_parametrized_test[{body}]'.format(body=body),
+    ...                              has_attachment()
+    ...                )
+    ...     )
+    """
+    allure.attach(attachment)
diff --git a/allure-python-commons/src/reporter.py b/allure-python-commons/src/reporter.py
@@ -20,6 +20,11 @@ def _update_item(self, uuid, **kwargs):
             else:
                 setattr(item, name, value)
 
+    def _last_executable(self):
+        for _uuid in reversed(self._items):
+            if isinstance(self._items[_uuid], ExecutableItem):
+                return _uuid
+
     def get_item(self, uuid):
         return self._items.get(uuid)
 
@@ -62,11 +67,7 @@ def close_test(self, uuid):
         plugin_manager.hook.report_result(result=test_case)
 
     def start_step(self, parent_uuid, uuid, step):
-        if not parent_uuid:
-            for _uuid in reversed(self._items):
-                if isinstance(self._items[_uuid], ExecutableItem):
-                    parent_uuid = _uuid
-                    break
+        parent_uuid = parent_uuid if parent_uuid else self._last_executable()
         self._items[parent_uuid].steps.append(step)
         self._items[uuid] = step
 
@@ -84,7 +85,7 @@ def _attach(self, uuid, name=None, attachment_type=None, extension=None):
 
         file_name = ATTACHMENT_PATTERN.format(prefix=uuid, ext=extension)
         attachment = Attachment(source=file_name, name=name, type=mime_type)
-        last_uuid = next(reversed(self._items))
+        last_uuid = self._last_executable()
         self._items[last_uuid].attachments.append(attachment)
 
         return file_name
