Merge pull request #4317 from edx/zoldak/increase-sqlite-timeout

Increase the test SQLite DB timeout. TE-397
2014-07-09 14:40:58 -04:00
parent 211f0797fb c216699953
commit 557a252314
2 changed files with 7 additions and 1 deletions
--- a/cms/envs/acceptance.py
+++ b/cms/envs/acceptance.py
@@ -67,7 +67,10 @@ DATABASES = {
    'default': {
        'ENGINE': 'django.db.backends.sqlite3',
        'NAME': TEST_ROOT / "db" / "test_edx.db",
-        'TEST_NAME': TEST_ROOT / "db" / "test_edx.db"
+        'TEST_NAME': TEST_ROOT / "db" / "test_edx.db",
+        'OPTIONS': {
+            'timeout': 30,
+        },
    }
 }

--- a/lms/envs/acceptance.py
+++ b/lms/envs/acceptance.py
@@ -58,6 +58,9 @@ DATABASES = {
        'ENGINE': 'django.db.backends.sqlite3',
        'NAME': TEST_ROOT / "db" / "test_edx.db",
        'TEST_NAME': TEST_ROOT / "db" / "test_edx.db",
+        'OPTIONS': {
+            'timeout': 30,
+        },
    }
 }