[django-1.7] tox: adapt settings and commands
This commit is contained in:
parent
f328f6fe8e
commit
40850ef3a8
|
@ -7,7 +7,7 @@ from authentic2.settings import INSTALLED_APPS, \
|
|||
MIDDLEWARE_CLASSES, AUTHENTICATION_BACKENDS
|
||||
|
||||
# Use Django default backend to pass Django tests
|
||||
AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) + AUTHENTICATION_BACKENDS
|
||||
AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) # + AUTHENTICATION_BACKENDS
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
|
@ -17,8 +17,8 @@ DATABASES = {
|
|||
}
|
||||
|
||||
if DEBUG:
|
||||
INSTALLED_APPS += ('debug_toolbar',)
|
||||
MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
|
||||
INSTALLED_APPS += ('debug_toolbar',)
|
||||
MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
|
||||
|
||||
|
||||
LANGUAGE_CODE = 'en'
|
||||
|
@ -31,3 +31,14 @@ A2_VALIDATE_EMAIL_DOMAIN = False
|
|||
MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
|
||||
LOGIN_REDIRECT_URL = '/accounts/profile/'
|
||||
LOGIN_URL = '/login/'
|
||||
|
||||
|
||||
MIGRATION_MODULES = {
|
||||
# these 'tests.migrations' modules don't actually exist, but this lets
|
||||
# us skip creating migrations for the test models.
|
||||
'auth': 'django.contrib.auth.tests.migrations',
|
||||
'contenttypes': 'django.contrib.contenttypes.tests.migrations',
|
||||
}
|
||||
INSTALLED_APPS += ('django.contrib.sites',)
|
||||
SITE_ID = 1
|
||||
TEMPLATE_DIRS = ('tests/templates',) + TEMPLATE_DIRS
|
||||
|
|
10
tox.ini
10
tox.ini
|
@ -9,19 +9,23 @@ envlist = django15, django16, django17
|
|||
[testenv:django15]
|
||||
commands =
|
||||
./getlasso.sh
|
||||
./authentic2-ctl --config=tests/test_settings test auth contenttypes sessions messages admin_tools theming menu dashboard authentic2
|
||||
./authentic2-ctl --config=tests/test_settings test auth contenttypes sessions messages admin_tools theming menu dashboard
|
||||
./authentic2-ctl test authentic2
|
||||
deps = django>1.5,< 1.6
|
||||
|
||||
[testenv:django16]
|
||||
commands =
|
||||
./getlasso.sh
|
||||
./authentic2-ctl --config=tests/test_settings test django.contrib.auth django.contrib.contenttypes django.contrib.sessions django.contrib.messages admin_tools authentic2
|
||||
./authentic2-ctl --config=tests/test_settings test django.contrib.auth django.contrib.contenttypes django.contrib.sessions django.contrib.messages admin_tools
|
||||
./authentic2-ctl test authentic2
|
||||
deps = django>1.6,<1.7
|
||||
|
||||
[testenv:django17]
|
||||
# django.contrib.auth is not tested it does not work with our templates
|
||||
commands =
|
||||
./getlasso.sh
|
||||
./authentic2-ctl --config=tests/test_settings test django.contrib.auth django.contrib.contenttypes django.contrib.sessions django.contrib.messages admin_tools authentic2
|
||||
./authentic2-ctl --config=tests/test_settings test django.contrib.contenttypes django.contrib.sessions django.contrib.messages admin_tools
|
||||
./authentic2-ctl test authentic2
|
||||
deps = django>1.7,<1.8
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue