diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-09-16 21:43:45 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-09-22 11:03:21 +0200 |
| commit | f4edb67a3ebe2871d6db7c9cc2635463654bd2e2 (patch) | |
| tree | 0d6db8bf7c1b97b474c510889c32448d9a8dc1d4 | |
| parent | Fix login tests for proper handling of LDAP exceptions. (diff) | |
| download | identity.gentoo.org-f4edb67a3ebe2871d6db7c9cc2635463654bd2e2.tar.gz identity.gentoo.org-f4edb67a3ebe2871d6db7c9cc2635463654bd2e2.tar.bz2 identity.gentoo.org-f4edb67a3ebe2871d6db7c9cc2635463654bd2e2.zip | |
Clean up django_auth_ldap leftovers.
| -rw-r--r-- | okupy/settings/__init__.py | 4 | ||||
| -rw-r--r-- | okupy/tests/settings.py | 5 | ||||
| -rw-r--r-- | okupy/tests/unit/test_login.py | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/okupy/settings/__init__.py b/okupy/settings/__init__.py index 0541edd..76f5ba1 100644 --- a/okupy/settings/__init__.py +++ b/okupy/settings/__init__.py @@ -140,10 +140,6 @@ LOGGING = { 'handlers': ['console' if DEBUG else 'syslog'], 'level': 'DEBUG' if DEBUG else 'INFO', }, - 'django_auth_ldap': { - 'handlers': ['console' if DEBUG else 'syslog'], - 'level': 'DEBUG' if DEBUG else 'INFO', - }, 'paramiko': { 'handlers': ['console' if DEBUG else 'syslog'], 'level': 'DEBUG' if DEBUG else 'INFO', diff --git a/okupy/tests/settings.py b/okupy/tests/settings.py index 1a83724..deb2f15 100644 --- a/okupy/tests/settings.py +++ b/okupy/tests/settings.py @@ -50,7 +50,6 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', - 'django_auth_ldap', 'django_otp', 'discover_runner', 'okupy.accounts', @@ -260,10 +259,6 @@ LOGGING = { 'handlers': ['console' if DEBUG else 'null'], 'level': 'DEBUG' if DEBUG else 'INFO', }, - 'django_auth_ldap': { - 'handlers': ['console' if DEBUG else 'null'], - 'level': 'DEBUG' if DEBUG else 'INFO', - }, } } diff --git a/okupy/tests/unit/test_login.py b/okupy/tests/unit/test_login.py index 424e8be..c9948db 100644 --- a/okupy/tests/unit/test_login.py +++ b/okupy/tests/unit/test_login.py @@ -52,7 +52,7 @@ class LoginUnitTests(OkupyTestCase): @no_database() @override_settings(AUTHENTICATION_BACKENDS=( - 'django_auth_ldap.backend.LDAPBackend', + 'okupy.common.auth.LDAPAuthBackend', 'django.contrib.auth.backends.ModelBackend')) def test_no_database_raises_critical(self): request = set_request(uri='/login', post=vars.LOGIN_ALICE, @@ -64,7 +64,7 @@ class LoginUnitTests(OkupyTestCase): @no_database() @override_settings(AUTHENTICATION_BACKENDS=( - 'django_auth_ldap.backend.LDAPBackend', + 'okupy.common.auth.LDAPAuthBackend', 'django.contrib.auth.backends.ModelBackend')) def test_no_database_sends_notification_mail(self): request = set_request(uri='/login', post=vars.LOGIN_ALICE, |