Skip to content

Commit 3d585cf

Browse files
committed
restore/undo debugging stuff
1 parent 05493ad commit 3d585cf

File tree

6 files changed

+4
-13
lines changed

6 files changed

+4
-13
lines changed

pytest_django_test/settings_base.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import os
2-
31
import django
42

53
ROOT_URLCONF = "pytest_django_test.urls"
@@ -14,10 +12,6 @@
1412
STATIC_URL = "/static/"
1513
SECRET_KEY = "foobar"
1614

17-
# Used to construct unique test database names to allow detox to run multiple
18-
# versions at the same time
19-
db_suffix = "_%s" % os.getuid()
20-
2115
MIDDLEWARE = [
2216
"django.contrib.sessions.middleware.SessionMiddleware",
2317
"django.middleware.common.CommonMiddleware",

pytest_django_test/settings_mysql_innodb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DATABASES = {
44
"default": {
55
"ENGINE": "django.db.backends.mysql",
6-
"NAME": "pytest_django_should_never_get_used" + db_suffix, # noqa: F405
6+
"NAME": "pytest_django_should_never_get_accessed",
77
"HOST": "localhost",
88
"USER": "root",
99
"OPTIONS": {"init_command": "SET default_storage_engine=InnoDB"},

pytest_django_test/settings_mysql_myisam.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DATABASES = {
44
"default": {
55
"ENGINE": "django.db.backends.mysql",
6-
"NAME": "pytest_django_should_never_get_used" + db_suffix, # noqa: F405
6+
"NAME": "pytest_django_should_never_get_accessed",
77
"HOST": "localhost",
88
"USER": "root",
99
"OPTIONS": {"init_command": "SET default_storage_engine=MyISAM"},

pytest_django_test/settings_postgres.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
DATABASES = {
1313
"default": {
1414
"ENGINE": "django.db.backends.postgresql_psycopg2",
15-
"NAME": "pytest_django_should_never_get_used" + db_suffix, # noqa: F405
15+
"NAME": "pytest_django_should_never_get_accessed",
1616
"HOST": "localhost",
1717
"USER": "",
1818
}

pytest_django_test/settings_sqlite_file.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
DATABASES = {
1212
"default": {
1313
"ENGINE": "django.db.backends.sqlite3",
14-
"NAME": "/pytest_django_should_never_get_used" + db_suffix, # noqa: F405
14+
"NAME": "/pytest_django_should_never_get_accessed",
1515
"TEST": {"NAME": _filename},
1616
}
1717
}

tests/test_db_setup.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,6 @@ def test_d(settings, worker_id):
206206
result.stdout.fnmatch_lines(["*PASSED*test_c*"])
207207
result.stdout.fnmatch_lines(["*PASSED*test_d*"])
208208

209-
django_testdir.runpytest_subprocess("--setup-plan", "-vv", "-n2", "-s", "--reuse-db")
210-
django_testdir.runpytest_subprocess("--setup-plan", "-vv", "-n2", "-s", "--reuse-db", "--create-db")
211-
212209
result = django_testdir.runpytest_subprocess(
213210
"-vv", "-n2", "-s", "--reuse-db", "--create-db"
214211
)

0 commit comments

Comments
 (0)