--- a/server/test/unittest_ldapuser.py Mon Feb 07 18:19:36 2011 +0100
+++ b/server/test/unittest_ldapuser.py Mon Feb 07 18:19:39 2011 +0100
@@ -49,8 +49,7 @@
"""
assert login, 'no login!'
searchfilter = [filter_format('(%s=%s)', (self.user_login_attr, login))]
- searchfilter.extend([filter_format('(%s=%s)', ('objectClass', o))
- for o in self.user_classes])
+ searchfilter.extend(self.base_filters)
searchstr = '(&%s)' % ''.join(searchfilter)
# first search the user
try:
@@ -456,8 +455,7 @@
self.pool = repo._get_pool()
session = mock_object(pool=self.pool)
self.o = RQL2LDAPFilter(ldapsource, session)
- self.ldapclasses = ''.join('(objectClass=%s)' % ldapcls
- for ldapcls in ldapsource.user_classes)
+ self.ldapclasses = ''.join(ldapsource.base_filters)
def tearDown(self):
repo._free_pool(self.pool)