|
12 | 12 | from django_auth_ldap.config import LDAPSearch |
13 | 13 | from django_auth_ldap.config import LDAPSearchUnion |
14 | 14 |
|
15 | | -from dejacode.ldap_config import build_user_search |
| 15 | +from dejacode_toolkit.ldap import build_user_search |
16 | 16 |
|
17 | 17 |
|
18 | 18 | class BuildUserSearchTestCase(SimpleTestCase): |
@@ -51,24 +51,18 @@ def test_build_user_search_entry_not_object_raises(self): |
51 | 51 |
|
52 | 52 | def test_build_user_search_missing_base_raises(self): |
53 | 53 | raw = '[{"filter": "(uid=%(user)s)"}]' |
54 | | - with self.assertRaisesMessage( |
55 | | - ImproperlyConfigured, "[0] must define 'base' and 'filter'" |
56 | | - ): |
| 54 | + with self.assertRaisesMessage(ImproperlyConfigured, "[0] must define 'base' and 'filter'"): |
57 | 55 | build_user_search(raw, "", "") |
58 | 56 |
|
59 | 57 | def test_build_user_search_missing_filter_raises(self): |
60 | 58 | raw = '[{"base": "ou=a,dc=example,dc=com"}]' |
61 | | - with self.assertRaisesMessage( |
62 | | - ImproperlyConfigured, "[0] must define 'base' and 'filter'" |
63 | | - ): |
| 59 | + with self.assertRaisesMessage(ImproperlyConfigured, "[0] must define 'base' and 'filter'"): |
64 | 60 | build_user_search(raw, "", "") |
65 | 61 |
|
66 | 62 | def test_build_user_search_error_index_points_to_bad_entry(self): |
67 | 63 | raw = ( |
68 | 64 | '[{"base": "ou=a,dc=example,dc=com", "filter": "(uid=%(user)s)"},' |
69 | 65 | ' {"base": "ou=b,dc=example,dc=com"}]' |
70 | 66 | ) |
71 | | - with self.assertRaisesMessage( |
72 | | - ImproperlyConfigured, "[1] must define 'base' and 'filter'" |
73 | | - ): |
| 67 | + with self.assertRaisesMessage(ImproperlyConfigured, "[1] must define 'base' and 'filter'"): |
74 | 68 | build_user_search(raw, "", "") |
0 commit comments