From 2157f7d928c218e5a5efb6bbc580389ffb4ce7c7 Mon Sep 17 00:00:00 2001 From: Chris NeJame Date: Thu, 23 Jan 2020 16:53:12 -0500 Subject: [PATCH] fix up a little more to prepare for squash --- tests/test_db_setup.py | 7 ++++--- tox.ini | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_db_setup.py b/tests/test_db_setup.py index 875d1d119..fc5ef35e7 100644 --- a/tests/test_db_setup.py +++ b/tests/test_db_setup.py @@ -162,9 +162,10 @@ def test_xdist_with_reuse(django_testdir): def _check(settings, worker_id): # Make sure that the database name looks correct db_name = settings.DATABASES['default']['NAME'] - assert db_name.startswith('test_pytest_django') - assert db_name.endswith("_{}".format(worker_id)) - + assert db_name == ( + 'test_pytest_django_should_never_get_accessed_inner_inner_{}' + .format(worker_id) + ) assert Item.objects.count() == 0 Item.objects.create(name='foo') assert Item.objects.count() == 1 diff --git a/tox.ini b/tox.ini index 584a26486..f2b023614 100644 --- a/tox.ini +++ b/tox.ini @@ -32,7 +32,6 @@ deps = pytest41: pytest>=4.1,<4.2 pytest41: attrs==17.4.0 xdist: pytest-xdist>=1.15 - xdist: pytest<5.3.4 setenv = PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}