diff -r a62f24e1497e -r c0278ad81823 server/test/unittest_ldapuser.py --- a/server/test/unittest_ldapuser.py Tue Apr 05 08:39:49 2011 +0200 +++ b/server/test/unittest_ldapuser.py Wed Apr 27 09:54:22 2011 +0200 @@ -1,4 +1,4 @@ -# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved. # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr # # This file is part of CubicWeb. @@ -51,8 +51,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: @@ -463,8 +462,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): self._repo.turn_repo_off()