fix redefined fixtures handling (via allure-framework#592)

Dmitry Gusakov · web-flow · commit a4e7f7f69fde · 2021-05-24T11:59:28.000+03:00
diff --git a/allure-pytest/src/listener.py b/allure-pytest/src/listener.py
@@ -268,13 +268,13 @@ def __init__(self):
         self._items = dict()
 
     def get(self, _id):
-        return self._items.get(str(_id))
+        return self._items.get(id(_id))
 
     def push(self, _id):
-        return self._items.setdefault(str(_id), uuid4())
+        return self._items.setdefault(id(_id), uuid4())
 
     def pop(self, _id):
-        return self._items.pop(str(_id), None)
+        return self._items.pop(id(_id), None)
 
 
 def _test_fixtures(item):
@@ -283,8 +283,8 @@ def _test_fixtures(item):
 
     if hasattr(item, "_request") and hasattr(item._request, "fixturenames"):
         for name in item._request.fixturenames:
-            fixturedef = fixturemanager.getfixturedefs(name, item.nodeid)
-            if fixturedef:
-                fixturedefs.append(fixturedef[-1])
+            fixturedefs_pytest = fixturemanager.getfixturedefs(name, item.nodeid)
+            if fixturedefs_pytest:
+                fixturedefs.extend(fixturedefs_pytest)
 
     return fixturedefs
diff --git a/allure-pytest/test/acceptance/fixture/fixture_test.py b/allure-pytest/test/acceptance/fixture/fixture_test.py
@@ -2,8 +2,8 @@
 import allure
 from hamcrest import assert_that, not_
 from allure_commons_test.report import has_test_case
-from allure_commons_test.container import has_container
-from allure_commons_test.container import has_before
+from allure_commons_test.container import has_container, has_before, has_after
+from allure_commons_test.result import has_step
 from itertools import combinations_with_replacement
 
 fixture_scopes = ["session", "module", "class", "function"]
@@ -217,3 +217,58 @@ def test_with_titled_conftest_fixtures(first_fixture, second_fixture):
                                             )
                               )
                 )
+
+
+def test_fixture_override(allured_testdir):
+    allured_testdir.testdir.makeconftest("""
+        import pytest
+        import allure
+
+        @pytest.fixture
+        def my_fixture():
+            with allure.step('Step in before in original fixture'):
+                pass
+            yield
+            with allure.step('Step in after in original fixture'):
+                pass
+
+    """)
+
+    allured_testdir.testdir.makepyfile("""
+        import pytest
+        import allure
+
+        @pytest.fixture
+        def my_fixture(my_fixture):
+            with allure.step('Step in before in redefined fixture'):
+                pass
+            yield
+            with allure.step('Step in after in redefined fixture'):
+                pass
+
+        def test_with_redefined_fixture(my_fixture):
+            pass
+    """)
+
+    allured_testdir.run_with_allure()
+
+    assert_that(allured_testdir.allure_report,
+                has_test_case("test_with_redefined_fixture",
+                              has_container(allured_testdir.allure_report,
+                                            has_before("my_fixture",
+                                                       has_step("Step in before in original fixture")
+                                                       ),
+                                            has_after("my_fixture::0",
+                                                      has_step("Step in after in original fixture")
+                                                      )
+                                            ),
+                              has_container(allured_testdir.allure_report,
+                                            has_before("my_fixture",
+                                                       has_step("Step in before in redefined fixture")
+                                                       ),
+                                            has_after("my_fixture::0",
+                                                      has_step("Step in after in redefined fixture")
+                                                      )
+                                            ),
+                              )
+                )
