Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix redefined fixtures handling #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sseliverstov merged 2 commits into from
May 24, 2021
Merged

Fix redefined fixtures handling #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b234a8
Fix redefined fixtures handling
May 24, 2021
be80e97
Fix linter remarks
May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions allure-pytest/src/listener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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
59 changes: 57 additions & 2 deletions allure-pytest/test/acceptance/fixture/fixture_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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")
)
),
)
)