Skip to content
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

Jump to bottom

WIP: call teardown_database always (with keepdb) #731

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: call teardown_database always (with keepdb) #731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions pytest_django/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,19 @@ def django_db_setup(
def teardown_database():
with django_db_blocker.unblock():
try:
teardown_databases(db_cfg, verbosity=request.config.option.verbose)
teardown_databases(
db_cfg,
verbosity=request.config.option.verbose,
keepdb=django_db_keepdb,
)
except Exception as exc:
request.node.warn(
pytest.PytestWarning(
"Error when trying to teardown test databases: %r" % exc
)
)

if not django_db_keepdb:
request.addfinalizer(teardown_database)
request.addfinalizer(teardown_database)


def _django_db_fixture_helper(
Expand Down