mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-22 11:07:57 +01:00
Code Issues Releases Wiki Activity

Merge branch 'feature/test-db-settings' of https://github.com/takeflight/wagtail into takeflight-feature/test-db-settings

Browse Source 
Conflicts:
	runtests.py
This commit is contained in:
Matt Westcott 2014-07-28 12:07:34 +01:00
commit 1d0c01e5fa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runtests.py
View File

@ -3,7 +3,6 @@ import sys
import os
import shutil
from django.conf import settings
from django.core.management import execute_from_command_line
from wagtail.tests.settings import STATIC_ROOT, MEDIA_ROOT

3
wagtail/tests/settings.py
View File

@ -11,8 +11,9 @@ MEDIA_ROOT = os.path.join(WAGTAIL_ROOT, 'test-media')
DATABASES = {
'default': {
'ENGINE': os.environ.get('DATABASE_ENGINE', 'django.db.backends.postgresql_psycopg2'),
'NAME': 'wagtaildemo',
'NAME': os.environ.get('DATABASE_NAME', 'wagtaildemo'),
'USER': os.environ.get('DATABASE_USER', 'postgres'),
'PASSWORD': os.environ.get('DATABASE_PASS', None),
}
}