diff -r 49075f57cf2c -r aa09e20dd8c0 server/test/unittest_ldapuser.py --- a/server/test/unittest_ldapuser.py Tue May 05 17:18:49 2009 +0200 +++ b/server/test/unittest_ldapuser.py Thu May 14 12:48:11 2009 +0200 @@ -24,7 +24,7 @@ # no such user raise AuthenticationError() # don't check upassword ! - return self.extid2eid(user['dn'], 'EUser', session) + return self.extid2eid(user['dn'], 'CWUser', session) @@ -34,40 +34,40 @@ class LDAPUserSourceTC(RepositoryBasedTC): repo, cnx = repo, cnx - + def patch_authenticate(self): self._orig_authenticate = LDAPUserSource.authenticate LDAPUserSource.authenticate = nopwd_authenticate def setUp(self): self._prepare() - # XXX: need this first query else we get 'database is locked' from + # XXX: need this first query else we get 'database is locked' from # sqlite since it doesn't support multiple connections on the same # database # so doing, ldap inserted users don't get removed between each test - rset = self.execute('EUser X') + rset = self.execute('CWUser X') self.commit() # check we get some users from ldap self.assert_(len(rset) > 1) self.maxeid = self.execute('Any MAX(X)')[0][0] - + def tearDown(self): if hasattr(self, '_orig_authenticate'): LDAPUserSource.authenticate = self._orig_authenticate RepositoryBasedTC.tearDown(self) - + def test_authenticate(self): source = self.repo.sources_by_uri['ldapuser'] self.assertRaises(AuthenticationError, source.authenticate, self.session, 'toto', 'toto') - + def test_synchronize(self): source = self.repo.sources_by_uri['ldapuser'] source.synchronize() - + def test_base(self): # check a known one - e = self.execute('EUser X WHERE X login "syt"').get_entity(0, 0) + e = self.execute('CWUser X WHERE X login "syt"').get_entity(0, 0) self.assertEquals(e.login, 'syt') e.complete() self.assertEquals(e.creation_date, None) @@ -79,49 +79,49 @@ self.assertEquals(e.created_by, []) self.assertEquals(e.primary_email[0].address, 'Sylvain Thenault') # email content should be indexed on the user - rset = self.execute('EUser X WHERE X has_text "thenault"') + rset = self.execute('CWUser X WHERE X has_text "thenault"') self.assertEquals(rset.rows, [[e.eid]]) def test_not(self): - eid = self.execute('EUser X WHERE X login "syt"')[0][0] - rset = self.execute('EUser X WHERE NOT X eid %s' % eid) + eid = self.execute('CWUser X WHERE X login "syt"')[0][0] + rset = self.execute('CWUser X WHERE NOT X eid %s' % eid) self.assert_(rset) self.assert_(not eid in (r[0] for r in rset)) def test_multiple(self): - seid = self.execute('EUser X WHERE X login "syt"')[0][0] - aeid = self.execute('EUser X WHERE X login "adim"')[0][0] - rset = self.execute('EUser X, Y WHERE X login "syt", Y login "adim"') + seid = self.execute('CWUser X WHERE X login "syt"')[0][0] + aeid = self.execute('CWUser X WHERE X login "adim"')[0][0] + rset = self.execute('CWUser X, Y WHERE X login "syt", Y login "adim"') self.assertEquals(rset.rows, [[seid, aeid]]) rset = self.execute('Any X,Y,L WHERE X login L, X login "syt", Y login "adim"') self.assertEquals(rset.rows, [[seid, aeid, 'syt']]) def test_in(self): - seid = self.execute('EUser X WHERE X login "syt"')[0][0] - aeid = self.execute('EUser X WHERE X login "adim"')[0][0] + seid = self.execute('CWUser X WHERE X login "syt"')[0][0] + aeid = self.execute('CWUser X WHERE X login "adim"')[0][0] rset = self.execute('Any X,L ORDERBY L WHERE X login IN("syt", "adim"), X login L') self.assertEquals(rset.rows, [[aeid, 'adim'], [seid, 'syt']]) def test_relations(self): - eid = self.execute('EUser X WHERE X login "syt"')[0][0] - rset = self.execute('Any X,E WHERE X is EUser, X login L, X primary_email E') + eid = self.execute('CWUser X WHERE X login "syt"')[0][0] + rset = self.execute('Any X,E WHERE X is CWUser, X login L, X primary_email E') self.assert_(eid in (r[0] for r in rset)) - rset = self.execute('Any X,L,E WHERE X is EUser, X login L, X primary_email E') + rset = self.execute('Any X,L,E WHERE X is CWUser, X login L, X primary_email E') self.assert_('syt' in (r[1] for r in rset)) def test_count(self): - nbusers = self.execute('Any COUNT(X) WHERE X is EUser')[0][0] + nbusers = self.execute('Any COUNT(X) WHERE X is CWUser')[0][0] # just check this is a possible number self.assert_(nbusers > 1, nbusers) self.assert_(nbusers < 30, nbusers) def test_upper(self): - eid = self.execute('EUser X WHERE X login "syt"')[0][0] + eid = self.execute('CWUser X WHERE X login "syt"')[0][0] rset = self.execute('Any UPPER(L) WHERE X eid %s, X login L' % eid) self.assertEquals(rset[0][0], 'SYT') def test_unknown_attr(self): - eid = self.execute('EUser X WHERE X login "syt"')[0][0] + eid = self.execute('CWUser X WHERE X login "syt"')[0][0] rset = self.execute('Any L,C,M WHERE X eid %s, X login L, ' 'X creation_date C, X modification_date M' % eid) self.assertEquals(rset[0][0], 'syt') @@ -139,13 +139,13 @@ def test_or(self): rset = self.execute('DISTINCT Any X WHERE X login "syt" OR (X in_group G, G name "managers")') self.assertEquals(len(rset), 2, rset.rows) # syt + admin - + def test_nonregr_set_owned_by(self): # test that when a user coming from ldap is triggering a transition # the related TrInfo has correct owner information self.execute('SET X in_group G WHERE X login "syt", G name "managers"') self.commit() - syt = self.execute('EUser X WHERE X login "syt"').get_entity(0, 0) + syt = self.execute('CWUser X WHERE X login "syt"').get_entity(0, 0) self.assertEquals([g.name for g in syt.in_group], ['managers', 'users']) self.patch_authenticate() cnx = self.login('syt', 'dummypassword') @@ -153,7 +153,7 @@ cu.execute('SET X in_state S WHERE X login "alf", S name "deactivated"') try: cnx.commit() - alf = self.execute('EUser X WHERE X login "alf"').get_entity(0, 0) + alf = self.execute('CWUser X WHERE X login "alf"').get_entity(0, 0) self.assertEquals(alf.in_state[0].name, 'deactivated') trinfo = alf.latest_trinfo() self.assertEquals(trinfo.owned_by[0].login, 'syt') @@ -175,10 +175,10 @@ def test_multiple_entities_from_different_sources(self): self.create_user('cochon') self.failUnless(self.execute('Any X,Y WHERE X login "syt", Y login "cochon"')) - + def test_exists1(self): - self.add_entity('EGroup', name=u'bougloup1') - self.add_entity('EGroup', name=u'bougloup2') + self.add_entity('CWGroup', name=u'bougloup1') + self.add_entity('CWGroup', name=u'bougloup2') self.execute('SET U in_group G WHERE G name ~= "bougloup%", U login "admin"') self.execute('SET U in_group G WHERE G name = "bougloup1", U login "syt"') rset = self.execute('Any L,SN ORDERBY L WHERE X in_state S, S name SN, X login L, EXISTS(X in_group G, G name ~= "bougloup%")') @@ -210,9 +210,9 @@ self.execute('SET X copain Y WHERE X login "comme", Y login "billy"') self.execute('SET X copain Y WHERE X login "syt", Y login "billy"') # search for group name, login where - # EUser copain with "comme" or "cochon" AND same login as the copain + # CWUser copain with "comme" or "cochon" AND same login as the copain # OR - # EUser in_state activated AND not copain with billy + # CWUser in_state activated AND not copain with billy # # SO we expect everybody but "comme" and "syt" rset= self.execute('Any GN,L WHERE X in_group G, X login L, G name GN, ' @@ -241,15 +241,15 @@ self.assertEquals(sorted(rset.rows), [['guests', 'cochon'], ['users', 'cochon'], ['users', 'syt']]) - + def test_cd_restriction(self): - rset = self.execute('EUser X WHERE X creation_date > "2009-02-01"') + rset = self.execute('CWUser X WHERE X creation_date > "2009-02-01"') self.assertEquals(len(rset), 2) # admin/anon but no ldap user since it doesn't support creation_date - + def test_union(self): afeids = self.execute('State X') - ueids = self.execute('EUser X') - rset = self.execute('(Any X WHERE X is State) UNION (Any X WHERE X is EUser)') + ueids = self.execute('CWUser X') + rset = self.execute('(Any X WHERE X is State) UNION (Any X WHERE X is CWUser)') self.assertEquals(sorted(r[0] for r in rset.rows), sorted(r[0] for r in afeids + ueids)) @@ -257,21 +257,21 @@ self.create_user('iaminguestsgrouponly', groups=('guests',)) cnx = self.login('iaminguestsgrouponly') return cnx.cursor() - + def test_security1(self): cu = self._init_security_test() rset = cu.execute('Any X WHERE X login "syt"') self.assertEquals(rset.rows, []) rset = cu.execute('Any X WHERE X login "iaminguestsgrouponly"') self.assertEquals(len(rset.rows), 1) - + def test_security2(self): cu = self._init_security_test() rset = cu.execute('Any X WHERE X has_text "syt"') self.assertEquals(rset.rows, []) rset = cu.execute('Any X WHERE X has_text "iaminguestsgrouponly"') self.assertEquals(len(rset.rows), 1) - + def test_security3(self): cu = self._init_security_test() rset = cu.execute('Any F WHERE X has_text "syt", X firstname F') @@ -298,18 +298,18 @@ emaileid = self.execute('INSERT EmailAddress X: X address "toto@logilab.org"')[0][0] self.execute('Any X,AA WHERE X use_email Y, Y eid %(x)s, X modification_date AA', {'x': emaileid}) - + def test_nonregr5(self): # original jpl query: - # Any X, NOW - CD, P WHERE P is Project, U interested_in P, U is EUser, U login "sthenault", X concerns P, X creation_date CD ORDERBY CD DESC LIMIT 5 + # Any X, NOW - CD, P WHERE P is Project, U interested_in P, U is CWUser, U login "sthenault", X concerns P, X creation_date CD ORDERBY CD DESC LIMIT 5 rql = 'Any X, NOW - CD, P ORDERBY CD DESC LIMIT 5 WHERE P bookmarked_by U, U login "%s", P is X, X creation_date CD' % self.session.user.login self.execute(rql, )#{'x': }) - + def test_nonregr6(self): self.execute('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File ' 'WITH U,UL BEING (Any U,UL WHERE ME eid %(x)s, (EXISTS(U identity ME) ' 'OR (EXISTS(U in_group G, G name IN("managers", "staff")))) ' - 'OR (EXISTS(U in_group H, ME in_group H, NOT H name "users")), U login UL, U is EUser)', + 'OR (EXISTS(U in_group H, ME in_group H, NOT H name "users")), U login UL, U is CWUser)', {'x': self.session.user.eid}) @@ -350,33 +350,33 @@ class RQL2LDAPFilterTC(RQLGeneratorTC): schema = repo.schema - + def setUp(self): RQLGeneratorTC.setUp(self) ldapsource = repo.sources[-1] self.pool = repo._get_pool() session = mock_object(pool=self.pool) self.o = RQL2LDAPFilter(ldapsource, session) - + def tearDown(self): repo._free_pool(self.pool) RQLGeneratorTC.tearDown(self) - + def test_base(self): - rqlst = self._prepare('EUser X WHERE X login "toto"').children[0] + rqlst = self._prepare('CWUser X WHERE X login "toto"').children[0] self.assertEquals(self.o.generate(rqlst, 'X')[1], '(&(objectClass=top)(objectClass=posixAccount)(uid=toto))') - + def test_kwargs(self): - rqlst = self._prepare('EUser X WHERE X login %(x)s').children[0] + rqlst = self._prepare('CWUser X WHERE X login %(x)s').children[0] self.o._args = {'x': "toto"} self.assertEquals(self.o.generate(rqlst, 'X')[1], '(&(objectClass=top)(objectClass=posixAccount)(uid=toto))') - + def test_get_attr(self): rqlst = self._prepare('Any X WHERE E firstname X, E eid 12').children[0] self.assertRaises(UnknownEid, self.o.generate, rqlst, 'E') - - + + if __name__ == '__main__': unittest_main()