Skip to content

Commit 580ccc8

Browse files
committed
Use request.fixturenames instead of argument for multi_db
1 parent 79a500b commit 580ccc8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pytest_django/fixtures.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ def _django_db_fixture_helper(transactional, request,
124124
else:
125125
from django.test import TestCase as django_case
126126

127+
django_case.multi_db = ('django_multi_db' in request.fixturenames)
127128
test_case = django_case(methodName='__init__')
128-
test_case.multi_db = multi_db
129129
test_case._pre_setup()
130130
request.addfinalizer(test_case._post_teardown)
131131

@@ -192,7 +192,7 @@ def django_multi_db(request, django_db_setup, django_db_blocker):
192192
or 'live_server' in request.funcargnames:
193193
request.getfuncargvalue('transactional_db')
194194
else:
195-
_django_db_fixture_helper(False, request, django_db_blocker, multi_db=True)
195+
request.getfuncargvalue('db')
196196

197197

198198
@pytest.fixture()

0 commit comments

Comments
 (0)