tests: settings: use explicit name for DB (that should not get used) (#805)

Author: blueyed

pytest_django_test/settings_base.py

@@ -1,5 +1,3 @@
-import os
-
 import django
 
 ROOT_URLCONF = "pytest_django_test.urls"
@@ -14,10 +12,6 @@
 STATIC_URL = "/static/"
 SECRET_KEY = "foobar"
 
-# Used to construct unique test database names to allow detox to run multiple
-# versions at the same time
-db_suffix = "_%s" % os.getuid()
-
 MIDDLEWARE = [
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",

pytest_django_test/settings_mysql_innodb.py

@@ -1,9 +1,9 @@
-from .settings_base import *  # noqa: F403
+from .settings_base import *  # noqa: F401 F403
 
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.mysql",
-        "NAME": "pytest_django" + db_suffix,  # noqa: F405
+        "NAME": "pytest_django_should_never_get_accessed",
         "HOST": "localhost",
         "USER": "root",
         "OPTIONS": {"init_command": "SET default_storage_engine=InnoDB"},

pytest_django_test/settings_mysql_myisam.py

@@ -1,9 +1,9 @@
-from pytest_django_test.settings_base import *  # noqa: F403
+from .settings_base import *  # noqa: F401 F403
 
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.mysql",
-        "NAME": "pytest_django" + db_suffix,  # noqa: F405
+        "NAME": "pytest_django_should_never_get_accessed",
         "HOST": "localhost",
         "USER": "root",
         "OPTIONS": {"init_command": "SET default_storage_engine=MyISAM"},

pytest_django_test/settings_postgres.py

@@ -1,4 +1,4 @@
-from pytest_django_test.settings_base import *  # noqa
+from .settings_base import *  # noqa: F401 F403
 
 # PyPy compatibility
 try:
@@ -12,7 +12,7 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "NAME": "pytest_django" + db_suffix,  # noqa
+        "NAME": "pytest_django_should_never_get_accessed",
         "HOST": "localhost",
         "USER": "",
     }

pytest_django_test/settings_sqlite.py

@@ -1,4 +1,4 @@
-from .settings_base import *  # noqa
+from .settings_base import *  # noqa: F401 F403
 
 DATABASES = {
     "default": {

pytest_django_test/settings_sqlite_file.py

@@ -1,6 +1,6 @@
 import tempfile
 
-from pytest_django_test.settings_base import *  # noqa
+from .settings_base import *  # noqa: F401 F403
 
 # This is a SQLite configuration, which uses a file based database for
 # tests (via setting TEST_NAME / TEST['NAME']).
@@ -11,7 +11,7 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": "/should_never_be_accessed",
+        "NAME": "/pytest_django_should_never_get_accessed",
         "TEST": {"NAME": _filename},
     }
 }