Fix --reuse-db and --create-db not working together

Fixes #411.
Closes #560.

Author: ryan-shaw

docs/database.rst

@@ -229,6 +229,16 @@ command line options.
 
 This fixture is by default requested from :fixture:`django_db_setup`.
 
+django_db_createdb
+""""""""""""""""""
+
+.. fixture:: django_db_createdb
+
+Returns whether or not the database is to be re-created before running any
+tests.
+
+This fixture is by default requested from :fixture:`django_db_setup`.
+
 django_db_blocker
 """""""""""""""""
 

pytest_django/fixtures.py

@@ -61,8 +61,12 @@ def django_db_use_migrations(request):
 
 @pytest.fixture(scope='session')
 def django_db_keepdb(request):
-    return (request.config.getvalue('reuse_db') and not
-            request.config.getvalue('create_db'))
+    return request.config.getvalue('reuse_db')
+
+
+@pytest.fixture(scope='session')
+def django_db_createdb(request):
+    return request.config.getvalue('create_db')
 
 
 @pytest.fixture(scope='session')
@@ -72,6 +76,7 @@ def django_db_setup(
     django_db_blocker,
     django_db_use_migrations,
     django_db_keepdb,
+    django_db_createdb,
     django_db_modify_db_settings,
 ):
     """Top level fixture to ensure test databases are available"""
@@ -82,7 +87,7 @@ def django_db_setup(
     if not django_db_use_migrations:
         _disable_native_migrations()
 
-    if django_db_keepdb:
+    if django_db_keepdb and not django_db_createdb:
         setup_databases_args['keepdb'] = True
 
     with django_db_blocker.unblock():

pytest_django/plugin.py

@@ -19,6 +19,7 @@
 from .fixtures import django_db_setup  # noqa
 from .fixtures import django_db_use_migrations  # noqa
 from .fixtures import django_db_keepdb  # noqa
+from .fixtures import django_db_createdb  # noqa
 from .fixtures import django_db_modify_db_settings  # noqa
 from .fixtures import django_db_modify_db_settings_xdist_suffix  # noqa
 from .fixtures import _live_server_helper  # noqa

tests/test_db_setup.py

@@ -75,6 +75,7 @@ def test_db_can_be_accessed():
     ])
 
     # Make sure the database has been re-created and the mark is gone
+    assert db_exists()
     assert not mark_exists()