xdist-one-db

Author: Alexander Karev

pytest_django/fixtures.py

@@ -32,7 +32,10 @@ def _django_db_setup(request,
 
     # xdist
     if hasattr(request.config, 'slaveinput'):
-        db_suffix = request.config.slaveinput['slaveid']
+        if request.config.getvalue('xdist_one_db'):
+            db_suffix = None
+        else:
+            db_suffix = request.config.slaveinput['slaveid']
     else:
         db_suffix = None
 

pytest_django/plugin.py

@@ -39,6 +39,9 @@ def pytest_addoption(parser):
                      action='store_true', dest='create_db', default=False,
                      help='Re-create the database, even if it exists. This '
                           'option will be ignored if not --reuse-db is given.')
+    group._addoption('--xdist-one-db',
+                     action='store_true', dest='xdist_one_db', default=False,
+                     help='Use only one database with xdist plugin.')
     group._addoption('--ds',
                      action='store', type='string', dest='ds', default=None,
                      help='Set DJANGO_SETTINGS_MODULE.')

tests/test_db_setup.py

@@ -109,6 +109,40 @@ def test_b(settings):
     result.stdout.fnmatch_lines(['*PASSED*test_b*'])
 
 
+@skip_on_python32
+def test_xdist_one_db(django_testdir):
+    skip_if_sqlite()
+
+    django_testdir.create_test_module('''
+        import pytest
+
+        from .app.models import Item
+
+        def _check(settings):
+            # Make sure that the database name looks correct
+            db_name = settings.DATABASES['default']['NAME']
+            assert not 'gw' in db_name
+
+            assert Item.objects.count() == 0
+            Item.objects.create(name='foo')
+            assert Item.objects.count() == 1
+
+
+        @pytest.mark.django_db
+        def test_a(settings):
+            _check(settings)
+
+
+        @pytest.mark.django_db
+        def test_b(settings):
+            _check(settings)
+    ''')
+
+    result = django_testdir.runpytest('-vv', '-n2', '-s', '--reuse-db', '--xdist-one-db')
+    result.stdout.fnmatch_lines(['*PASSED*test_a*'])
+    result.stdout.fnmatch_lines(['*PASSED*test_b*'])
+
+
 class TestSqliteWithXdist:
 
     pytestmark = skip_on_python32