Fix --reuse-db and --create-db not working together. Fixes #411

Author: ryan-shaw

pytest_django/fixtures.py

@@ -99,7 +99,7 @@ def teardown_database():
                 verbosity=pytest.config.option.verbose,
             )
 
-    if not django_db_keepdb:
+    if not request.config.getvalue('reuse_db'):
         request.addfinalizer(teardown_database)
 
 

tests/test_db_setup.py

@@ -20,6 +20,27 @@ def test_db_can_be_accessed():
 
     result = django_testdir.runpytest_subprocess('-v', '--reuse-db')
     assert result.ret == 0
+    assert db_exists()
+    result.stdout.fnmatch_lines([
+        "*test_db_can_be_accessed PASSED*",
+    ])
+
+
+def test_db_reuse_create_simple(django_testdir):
+    "A test for all backends to check that `--reuse-db` with `--create-db` works."
+    django_testdir.create_test_module('''
+        import pytest
+
+        from .app.models import Item
+
+        @pytest.mark.django_db
+        def test_db_can_be_accessed():
+            assert Item.objects.count() == 0
+    ''')
+
+    result = django_testdir.runpytest_subprocess('-v', '--reuse-db', '--create-db')
+    assert result.ret == 0
+    assert db_exists()
     result.stdout.fnmatch_lines([
         "*test_db_can_be_accessed PASSED*",
     ])