# HG changeset patch # User Sylvain Thénault # Date 1269937103 -7200 # Node ID 494ae4ad4a1476823b3d440d968b642e4699225b # Parent 2a94b61837e1de0eba4c1e76d595e370d50edf1a [test] CubicWebTC.create_user expect an actual query, and we don't need to give session here diff -r 2a94b61837e1 -r 494ae4ad4a14 server/test/unittest_ldapuser.py --- a/server/test/unittest_ldapuser.py Tue Mar 30 10:17:29 2010 +0200 +++ b/server/test/unittest_ldapuser.py Tue Mar 30 10:18:23 2010 +0200 @@ -189,7 +189,7 @@ self.sexecute('Any X, Y WHERE X copain Y, X login "comme", Y login "cochon"') def test_multiple_entities_from_different_sources(self): - self.create_user('cochon', req=self.session) + self.create_user('cochon') self.failUnless(self.sexecute('Any X,Y WHERE X login %(syt)s, Y login "cochon"', {'syt': SYT})) def test_exists1(self): @@ -202,15 +202,15 @@ self.assertEquals(rset.rows, [['admin', 'activated'], [SYT, 'activated']]) def test_exists2(self): - self.create_user('comme', req=self.session) - self.create_user('cochon', req=self.session) + self.create_user('comme') + self.create_user('cochon') self.sexecute('SET X copain Y WHERE X login "comme", Y login "cochon"') rset = self.sexecute('Any GN ORDERBY GN WHERE X in_group G, G name GN, (G name "managers" OR EXISTS(X copain T, T login in ("comme", "cochon")))') self.assertEquals(rset.rows, [['managers'], ['users']]) def test_exists3(self): - self.create_user('comme', req=self.session) - self.create_user('cochon', req=self.session) + self.create_user('comme') + self.create_user('cochon') self.sexecute('SET X copain Y WHERE X login "comme", Y login "cochon"') self.failUnless(self.sexecute('Any X, Y WHERE X copain Y, X login "comme", Y login "cochon"')) self.sexecute('SET X copain Y WHERE X login %(syt)s, Y login "cochon"', {'syt': SYT}) @@ -219,9 +219,9 @@ self.assertEquals(sorted(rset.rows), [['managers', 'admin'], ['users', 'comme'], ['users', SYT]]) def test_exists4(self): - self.create_user('comme', req=self.session) - self.create_user('cochon', groups=('users', 'guests'), req=self.session) - self.create_user('billy', req=self.session) + self.create_user('comme') + self.create_user('cochon', groups=('users', 'guests')) + self.create_user('billy') self.sexecute('SET X copain Y WHERE X login "comme", Y login "cochon"') self.sexecute('SET X copain Y WHERE X login "cochon", Y login "cochon"') self.sexecute('SET X copain Y WHERE X login "comme", Y login "billy"') @@ -241,9 +241,9 @@ self.assertEquals(sorted(rset.rows), sorted(all.rows)) def test_exists5(self): - self.create_user('comme', req=self.session) - self.create_user('cochon', groups=('users', 'guests'), req=self.session) - self.create_user('billy', req=self.session) + self.create_user('comme') + self.create_user('cochon', groups=('users', 'guests')) + self.create_user('billy') self.sexecute('SET X copain Y WHERE X login "comme", Y login "cochon"') self.sexecute('SET X copain Y WHERE X login "cochon", Y login "cochon"') self.sexecute('SET X copain Y WHERE X login "comme", Y login "billy"') @@ -273,7 +273,7 @@ sorted(r[0] for r in afeids + ueids)) def _init_security_test(self): - self.create_user('iaminguestsgrouponly', groups=('guests',), req=self.session) + self.create_user('iaminguestsgrouponly', groups=('guests',)) cnx = self.login('iaminguestsgrouponly') return cnx.cursor()