From 0b8871ab6744285943784795ede053839ee009ef Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Thu, 3 Sep 2020 00:48:40 -0700 Subject: [PATCH] Fixed #31979 -- Made django.test.utils.setup_databases()'s time_keeper argument optional. --- django/test/utils.py | 5 ++++- docs/topics/testing/advanced.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/django/test/utils.py b/django/test/utils.py index 908cc38bcf..85aa7e06c0 100644 --- a/django/test/utils.py +++ b/django/test/utils.py @@ -156,9 +156,12 @@ def teardown_test_environment(): del mail.outbox -def setup_databases(verbosity, interactive, *, time_keeper, keepdb=False, debug_sql=False, parallel=0, +def setup_databases(verbosity, interactive, *, time_keeper=None, keepdb=False, debug_sql=False, parallel=0, aliases=None): """Create the test databases.""" + if time_keeper is None: + time_keeper = NullTimeKeeper() + test_databases, mirrored_aliases = get_unique_databases_and_mirrors(aliases) old_names = [] diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt index 96fadf96b3..54fed92168 100644 --- a/docs/topics/testing/advanced.txt +++ b/docs/topics/testing/advanced.txt @@ -726,7 +726,7 @@ utility methods in the ``django.test.utils`` module. Performs global post-test teardown, such as removing instrumentation from the template system and restoring normal email services. -.. function:: setup_databases(verbosity, interactive, *, time_keeper, keepdb=False, debug_sql=False, parallel=0, aliases=None, **kwargs) +.. function:: setup_databases(verbosity, interactive, *, time_keeper=None, keepdb=False, debug_sql=False, parallel=0, aliases=None, **kwargs) Creates the test databases.