Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16269 from edx/jmbowman/PLAT-1555

Browse Source 
PLAT-1555 Stop using deprecated TEST_* DB setting keys
This commit is contained in:
Jeremy Bowman
2017-10-18 16:03:10 -04:00
committed by GitHub
parent 13f3b496a2 bda84d526b
commit 725edbbc7b
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/envs/acceptance.py
View File

@@ -75,19 +75,23 @@ DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': TEST_ROOT / "db" / "test_edx.db",
'TEST_NAME': TEST_ROOT / "db" / "test_edx.db",
'OPTIONS': {
'timeout': 30,
},
'ATOMIC_REQUESTS': True,
'TEST': {
'NAME': TEST_ROOT / "db" / "test_edx.db",
},
},
'student_module_history': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': TEST_ROOT / "db" / "test_student_module_history.db",
'TEST_NAME': TEST_ROOT / "db" / "test_student_module_history.db",
'OPTIONS': {
'timeout': 30,
},
'TEST': {
'NAME': TEST_ROOT / "db" / "test_student_module_history.db",
},
}
}

8
lms/envs/acceptance.py
View File

@@ -67,19 +67,23 @@ DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': TEST_ROOT / "db" / "test_edx.db",
'TEST_NAME': TEST_ROOT / "db" / "test_edx.db",
'OPTIONS': {
'timeout': 30,
},
'ATOMIC_REQUESTS': True,
'TEST': {
'NAME': TEST_ROOT / "db" / "test_edx.db",
},
},
'student_module_history': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': TEST_ROOT / "db" / "test_student_module_history.db",
'TEST_NAME': TEST_ROOT / "db" / "test_student_module_history.db",
'OPTIONS': {
'timeout': 30,
},
'TEST': {
'NAME': TEST_ROOT / "db" / "test_student_module_history.db",
},
}
}