Skip to content

Revert workaround for not optional django.test.utils.setup_databases()'s time_keeper. #866

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.

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 1 commit into from
Sep 14, 2020
Merged
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
35 changes: 4 additions & 31 deletions pytest_django/compat.py
Original file line number Diff line number Diff line change
@@ -1,39 +1,12 @@
# This file cannot be imported from until Django sets up


def _get_setup_and_teardown_databases():
try:
# Django 3.2+ has added timing capabilities that we don't really support
# right now. Unfortunately that new time_keeper is required.
from django.test.utils import NullTimeKeeper
except ImportError:
pass
else:
from django.test.utils import setup_databases, teardown_databases

def wrapped_setup_databases(*args, **kwargs):
return setup_databases(*args, time_keeper=NullTimeKeeper(), **kwargs)

return wrapped_setup_databases, teardown_databases

try:
# Django 1.11+
from django.test.utils import setup_databases, teardown_databases # noqa: F401, F811
except ImportError:
pass
else:
return setup_databases, teardown_databases

try:
# Django 1.11+
from django.test.utils import setup_databases, teardown_databases # noqa: F401, F811
except ImportError:
# In Django prior to 1.11, teardown_databases is only available as a method on DiscoverRunner
from django.test.runner import setup_databases, DiscoverRunner # noqa: F401, F811

def teardown_databases(db_cfg, verbosity):
DiscoverRunner(verbosity=verbosity, interactive=False).teardown_databases(
db_cfg
)

return setup_databases, teardown_databases


setup_databases, teardown_databases = _get_setup_and_teardown_databases()
del _get_setup_and_teardown_databases