Prefixed fixture name with django_

Author: pmourlanne

docs/helpers.rst

@@ -26,7 +26,7 @@ of the test. This behavior is the same as Django's standard
 
 In order for a test to have access to the database it must either
 be marked using the ``django_db`` mark or request one of the ``db``,
-``transactional_db`` or ``multi_db`` fixtures.  Otherwise the test will
+``transactional_db`` or ``django_multi_db`` fixtures.  Otherwise the test will
 fail when trying to access the database.
 
 :type transaction: bool
@@ -52,7 +52,7 @@ fail when trying to access the database.
   this marker will not help even if the function requesting your
   fixture has this marker applied.  To access the database in a
   fixture, the fixture itself will have to request the ``db``,
-  ``transactional_db`` or ``multi_db`` fixture.  See below for a
+  ``transactional_db`` or ``django_multi_db`` fixture.  See below for a
   description of them.
 
 .. note:: Automatic usage with ``django.test.TestCase``.
@@ -201,8 +201,8 @@ transaction support.  This is only required for fixtures which need
 database access themselves.  A test function would normally use the
 :py:func:`~pytest.mark.django_db` mark to signal it needs the database.
 
-``multi_db``
-~~~~~~~~~~~~
+``django_multi_db``
+~~~~~~~~~~~~~~~~~~
 
 This fixture can be used to request access to the database including
 multiple database support.  This is only required for fixtures which

pytest_django/fixtures.py

@@ -12,7 +12,7 @@
 
 from .lazy_django import get_django_version, skip_if_no_django
 
-__all__ = ['django_db_setup', 'db', 'transactional_db', 'multi_db',
+__all__ = ['django_db_setup', 'db', 'transactional_db', 'django_multi_db',
            'admin_user', 'django_user_model', 'django_username_field',
            'client', 'admin_client', 'rf', 'settings', 'live_server',
            '_live_server_helper']
@@ -177,7 +177,7 @@ def transactional_db(request, django_db_setup, django_db_blocker):
 
 
 @pytest.fixture(scope='function')
-def multi_db(request, django_db_setup, django_db_blocker):
+def django_multi_db(request, django_db_setup, django_db_blocker):
     """Require a django test database
 
     This behaves like the ``db`` fixture, with the addition of marking

pytest_django/plugin.py

@@ -30,7 +30,7 @@
 from .fixtures import live_server  # noqa
 from .fixtures import rf  # noqa
 from .fixtures import settings  # noqa
-from .fixtures import transactional_db, multi_db  # noqa
+from .fixtures import transactional_db, django_multi_db  # noqa
 
 from .lazy_django import (django_settings_is_configured,
                           get_django_version, skip_if_no_django)
@@ -364,15 +364,15 @@ def _django_db_marker(request):
     """Implement the django_db marker, internal to pytest-django.
 
     This will dynamically request the ``db``, ``transactional_db``
-    or ``multi_db`` fixtures as required by the django_db marker.
+    or ``django_multi_db`` fixtures as required by the django_db marker.
     """
     marker = request.keywords.get('django_db', None)
     if marker:
         validate_django_db(marker)
         if marker.transaction:
             request.getfuncargvalue('transactional_db')
         elif marker.multi_db:
-            request.getfuncargvalue('multi_db')
+            request.getfuncargvalue('django_multi_db')
         else:
             request.getfuncargvalue('db')
 

tests/test_database.py

@@ -56,11 +56,11 @@ def test_transactions_enabled(self, transactional_db):
 
         assert not connection.in_atomic_block
 
-    def test_multi_db_enabled(self, multi_db):
+    def test_multi_db_enabled(self, django_multi_db):
         # TODO
         pass
 
-    def test_multi_db_transactions_enabled(self, transactional_db, multi_db):
+    def test_multi_db_transactions_enabled(self, transactional_db, django_multi_db):
         # TODO
         pass