Skip to content

Lock/unlock of db breaks if pytest is executed twice in the same process (fixes #1147) #1148

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
merged 2 commits into from
Sep 28, 2024
Merged

Lock/unlock of db breaks if pytest is executed twice in the same process (fixes #1147) #1148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
062ab4e
Lock/unlock of db breaks if pytest is executed twice in the same proc…
boxed Sep 28, 2024
3904a67
Merge branch 'main' into issue-1147
boxed Sep 28, 2024
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
7 changes: 7 additions & 0 deletions pytest_django/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,13 @@ def get_order_number(test: pytest.Item) -> int:
items.sort(key=get_order_number)


def pytest_unconfigure(config: pytest.Config) -> None:
if blocking_manager_key not in config.stash:
return
blocking_manager = config.stash[blocking_manager_key]
blocking_manager.unblock()


@pytest.fixture(autouse=True, scope="session")
def django_test_environment(request: pytest.FixtureRequest) -> Generator[None, None, None]:
"""Setup Django's test environment for the testing session.
Expand Down