From b6ff4ede77b037064a5d4dc9497dc80386b28f75 Mon Sep 17 00:00:00 2001 From: Hugo Rodger-Brown Date: Sat, 15 Aug 2020 15:34:42 +0100 Subject: [PATCH] Update setup_databases call to handle 3.1+ --- pytest_django/compat.py | 9 +++++++++ pytest_django/fixtures.py | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pytest_django/compat.py b/pytest_django/compat.py index 9203a50e1..54bad5f40 100644 --- a/pytest_django/compat.py +++ b/pytest_django/compat.py @@ -13,3 +13,12 @@ def teardown_databases(db_cfg, verbosity): _DiscoverRunner(verbosity=verbosity, interactive=False).teardown_databases( db_cfg ) + + +# Import NullTimeKeeper from Django > 3.1 for setup_databases call - +# fix for https://github.com/pytest-dev/pytest-django/issues/858 +try: + from django.test.utils import NullTimeKeeper + setup_databases_args = {"time_keeper": NullTimeKeeper()} +except ImportError: + setup_databases_args = {} diff --git a/pytest_django/fixtures.py b/pytest_django/fixtures.py index b2cc82580..c6a0b16e2 100644 --- a/pytest_django/fixtures.py +++ b/pytest_django/fixtures.py @@ -91,9 +91,7 @@ def django_db_setup( django_db_modify_db_settings, ): """Top level fixture to ensure test databases are available""" - from .compat import setup_databases, teardown_databases - - setup_databases_args = {} + from .compat import setup_databases, teardown_databases, setup_databases_args if not django_db_use_migrations: _disable_native_migrations()