Skip to content
Draft
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions pytest_django/fixtures.py
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