cubicweb: comparison server/test/unittest

equal deleted inserted replaced

-:1349398d744e
+:52647b05bda8
 shutil.rmtree(cls._tmpdir)
 except:
 pass
 @classmethod
-def pre_setup_database(cls, session, config):
+def pre_setup_database(cls, cnx, config):
-session.create_entity('CWSource', name=u'ldap', type=u'ldapfeed', parser=u'ldapfeed',
+cnx.create_entity('CWSource', name=u'ldap', type=u'ldapfeed', parser=u'ldapfeed',
 url=URL, config=CONFIG_LDAPFEED)
-session.commit()
+cnx.commit()
-return cls._pull(session)
+return cls.pull(cnx)
 @classmethod
-def _pull(cls, session):
+def pull(self, cnx):
-with session.repo.internal_session() as isession:
+lfsource = cnx.repo.sources_by_uri['ldap']
-lfsource = isession.repo.sources_by_uri['ldap']
+stats = lfsource.pull_data(cnx, force=True, raise_on_error=True)
-stats = lfsource.pull_data(isession, force=True, raise_on_error=True)
+cnx.commit()
-isession.commit()
+return stats
-return stats
-def pull(self):
-return self._pull(self.session)
 def setup_database(self):
-with self.session.repo.internal_session(safe=True) as session:
+with self.admin_access.repo_cnx() as cnx:
-session.execute('DELETE Any E WHERE E cw_source S, S name "ldap"')
+cnx.execute('DELETE Any E WHERE E cw_source S, S name "ldap"')
-session.execute('SET S config %(conf)s, S url %(url)s '
+cnx.execute('SET S config %(conf)s, S url %(url)s '
 'WHERE S is CWSource, S name "ldap"',
 {"conf": CONFIG_LDAPFEED, 'url': URL} )
-session.commit()
+cnx.commit()
-self.pull()
+with self.repo.internal_cnx() as cnx:
+self.pull(cnx)
 def add_ldap_entry(self, dn, mods):
 """
 add an LDAP entity
 """
 A testcase for situations where the default group for CWUser
 created from LDAP is wrongly configured.
 """
 def test_wrong_group(self):
-with self.session.repo.internal_session(safe=True) as session:
+with self.admin_access.repo_cnx() as cnx:
-source = self.session.execute('CWSource S WHERE S type="ldapfeed"').get_entity(0,0)
+source = cnx.execute('CWSource S WHERE S type="ldapfeed"').get_entity(0,0)
 config = source.repo_source.check_config(source)
 # inject a bogus group here, along with at least a valid one
 config['user-default-group'] = ('thisgroupdoesnotexists','users')
 source.repo_source.update_config(source, config)
-session.commit(free_cnxset=False)
+cnx.commit()
 # here we emitted an error log entry
-stats = source.repo_source.pull_data(session, force=True, raise_on_error=True)
+stats = source.repo_source.pull_data(cnx, force=True, raise_on_error=True)
-session.commit()
+cnx.commit()
 class LDAPFeedUserTC(LDAPFeedTestBase):
 """
 self.assertTrue(entity.creation_date)
 self.assertTrue(entity.modification_date)
 def test_authenticate(self):
 source = self.repo.sources_by_uri['ldap']
-self.session.set_cnxset()
+with self.admin_access.repo_cnx() as cnx:
 # ensure we won't be logged against
 self.assertRaises(AuthenticationError,
-source.authenticate, self.session, 'toto', 'toto')
+source.authenticate, cnx, 'toto', 'toto')
-self.assertTrue(source.authenticate(self.session, 'syt', 'syt'))
+self.assertTrue(source.authenticate(cnx, 'syt', 'syt'))
 self.assertTrue(self.repo.connect('syt', password='syt'))
 def test_base(self):
-# check a known one
+with self.admin_access.repo_cnx() as cnx:
-rset = self.sexecute('CWUser X WHERE X login %(login)s', {'login': 'syt'})
+# check a known one
-e = rset.get_entity(0, 0)
+rset = cnx.execute('CWUser X WHERE X login %(login)s', {'login': 'syt'})
-self.assertEqual(e.login, 'syt')
+e = rset.get_entity(0, 0)
-e.complete()
+self.assertEqual(e.login, 'syt')
-self.assertMetadata(e)
+e.complete()
-self.assertEqual(e.firstname, None)
+self.assertMetadata(e)
-self.assertEqual(e.surname, None)
+self.assertEqual(e.firstname, None)
-self.assertIn('users', set(g.name for g in e.in_group))
+self.assertEqual(e.surname, None)
-self.assertEqual(e.owned_by[0].login, 'syt')
+self.assertIn('users', set(g.name for g in e.in_group))
-self.assertEqual(e.created_by, ())
+self.assertEqual(e.owned_by[0].login, 'syt')
-addresses = [pe.address for pe in e.use_email]
+self.assertEqual(e.created_by, ())
-addresses.sort()
+addresses = [pe.address for pe in e.use_email]
-self.assertEqual(['sylvain.thenault@logilab.fr', 'syt@logilab.fr'],
+addresses.sort()
-addresses)
+self.assertEqual(['sylvain.thenault@logilab.fr', 'syt@logilab.fr'],
-self.assertIn(e.primary_email[0].address, ['sylvain.thenault@logilab.fr',
+addresses)
-'syt@logilab.fr'])
+self.assertIn(e.primary_email[0].address, ['sylvain.thenault@logilab.fr',
-# email content should be indexed on the user
+'syt@logilab.fr'])
-rset = self.sexecute('CWUser X WHERE X has_text "thenault"')
+# email content should be indexed on the user
-self.assertEqual(rset.rows, [[e.eid]])
+rset = cnx.execute('CWUser X WHERE X has_text "thenault"')
+self.assertEqual(rset.rows, [[e.eid]])
 def test_copy_to_system_source(self):
 "make sure we can 'convert' an LDAP user into a system one"
-source = self.repo.sources_by_uri['ldap']
+with self.admin_access.repo_cnx() as cnx:
-eid = self.sexecute('CWUser X WHERE X login %(login)s', {'login': 'syt'})[0][0]
+source = self.repo.sources_by_uri['ldap']
-self.sexecute('SET X cw_source S WHERE X eid %(x)s, S name "system"', {'x': eid})
+eid = cnx.execute('CWUser X WHERE X login %(login)s', {'login': 'syt'})[0][0]
-self.commit()
+cnx.execute('SET X cw_source S WHERE X eid %(x)s, S name "system"', {'x': eid})
-source.reset_caches()
+cnx.commit()
-rset = self.sexecute('CWUser X WHERE X login %(login)s', {'login': 'syt'})
+source.reset_caches()
-self.assertEqual(len(rset), 1)
+rset = cnx.execute('CWUser X WHERE X login %(login)s', {'login': 'syt'})
-e = rset.get_entity(0, 0)
+self.assertEqual(len(rset), 1)
-self.assertEqual(e.eid, eid)
+e = rset.get_entity(0, 0)
-self.assertEqual(e.cw_metainformation(), {'source': {'type': u'native',
+self.assertEqual(e.eid, eid)
-'uri': u'system',
+self.assertEqual(e.cw_metainformation(), {'source': {'type': u'native',
-'use-cwuri-as-url': False},
+'uri': u'system',
-'type': 'CWUser',
+'use-cwuri-as-url': False},
-'extid': None})
+'type': 'CWUser',
-self.assertEqual(e.cw_source[0].name, 'system')
+'extid': None})
-self.assertTrue(e.creation_date)
+self.assertEqual(e.cw_source[0].name, 'system')
-self.assertTrue(e.modification_date)
+self.assertTrue(e.creation_date)
-source.pull_data(self.session)
+self.assertTrue(e.modification_date)
-rset = self.sexecute('CWUser X WHERE X login %(login)s', {'login': 'syt'})
+source.pull_data(cnx)
-self.assertEqual(len(rset), 1)
+rset = cnx.execute('CWUser X WHERE X login %(login)s', {'login': 'syt'})
-self.assertTrue(self.repo.system_source.authenticate(
+self.assertEqual(len(rset), 1)
-self.session, 'syt', password='syt'))
+self.assertTrue(self.repo.system_source.authenticate(cnx, 'syt', password='syt'))
 # make sure the pull from ldap have not "reverted" user as a ldap-feed user
 self.assertEqual(e.cw_metainformation(), {'source': {'type': u'native',
 'uri': u'system',
 'use-cwuri-as-url': False},
 'type': 'CWUser',
 'extid': None})
 # and that the password stored in the system source is not empty or so
-user = self.execute('CWUser U WHERE U login "syt"').get_entity(0, 0)
+user = cnx.execute('CWUser U WHERE U login "syt"').get_entity(0, 0)
 user.cw_clear_all_caches()
-pwd = self.session.system_sql("SELECT cw_upassword FROM cw_cwuser WHERE cw_login='syt';").fetchall()[0][0]
+pwd = cnx.system_sql("SELECT cw_upassword FROM cw_cwuser WHERE cw_login='syt';").fetchall()[0][0]
 self.assertIsNotNone(pwd)
 self.assertTrue(str(pwd))
 class LDAPFeedUserDeletionTC(LDAPFeedTestBase):
 """
 A testcase for situations where users are deleted from or
-unavailabe in the LDAP database.
+unavailable in the LDAP database.
 """
 def test_a_filter_inactivate(self):
 """ filtered out people should be deactivated, unable to authenticate """
-source = self.session.execute('CWSource S WHERE S type="ldapfeed"').get_entity(0,0)
+with self.admin_access.repo_cnx() as cnx:
-config = source.repo_source.check_config(source)
+source = cnx.execute('CWSource S WHERE S type="ldapfeed"').get_entity(0,0)
-# filter with adim's phone number
+config = source.repo_source.check_config(source)
-config['user-filter'] = u'(%s=%s)' % ('telephoneNumber', '109')
+# filter with adim's phone number
-source.repo_source.update_config(source, config)
+config['user-filter'] = u'(%s=%s)' % ('telephoneNumber', '109')
-self.commit()
+source.repo_source.update_config(source, config)
-self.pull()
+cnx.commit()
+with self.repo.internal_cnx() as cnx:
+self.pull(cnx)
 self.assertRaises(AuthenticationError, self.repo.connect, 'syt', password='syt')
-self.assertEqual(self.execute('Any N WHERE U login "syt", '
+with self.admin_access.repo_cnx() as cnx:
-'U in_state S, S name N').rows[0][0],
+self.assertEqual(cnx.execute('Any N WHERE U login "syt", '
-'deactivated')
+'U in_state S, S name N').rows[0][0],
-self.assertEqual(self.execute('Any N WHERE U login "adim", '
+'deactivated')
-'U in_state S, S name N').rows[0][0],
+self.assertEqual(cnx.execute('Any N WHERE U login "adim", '
-'activated')
+'U in_state S, S name N').rows[0][0],
-# unfilter, syt should be activated again
+'activated')
-config['user-filter'] = u''
+# unfilter, syt should be activated again
-source.repo_source.update_config(source, config)
+config['user-filter'] = u''
-self.commit()
+source.repo_source.update_config(source, config)
-self.pull()
+cnx.commit()
-self.assertEqual(self.execute('Any N WHERE U login "syt", '
+with self.repo.internal_cnx() as cnx:
-'U in_state S, S name N').rows[0][0],
+self.pull(cnx)
-'activated')
+with self.admin_access.repo_cnx() as cnx:
-self.assertEqual(self.execute('Any N WHERE U login "adim", '
+self.assertEqual(cnx.execute('Any N WHERE U login "syt", '
 'U in_state S, S name N').rows[0][0],
 'activated')
+self.assertEqual(cnx.execute('Any N WHERE U login "adim", '
+'U in_state S, S name N').rows[0][0],
+'activated')
 def test_delete(self):
 """ delete syt, pull, check deactivation, repull,
 read syt, pull, check activation
 """
 self.delete_ldap_entry('uid=syt,ou=People,dc=cubicweb,dc=test')
-self.pull()
+with self.repo.internal_cnx() as cnx:
+self.pull(cnx)
 self.assertRaises(AuthenticationError, self.repo.connect, 'syt', password='syt')
-self.assertEqual(self.execute('Any N WHERE U login "syt", '
+with self.admin_access.repo_cnx() as cnx:
-'U in_state S, S name N').rows[0][0],
+self.assertEqual(cnx.execute('Any N WHERE U login "syt", '
-'deactivated')
+'U in_state S, S name N').rows[0][0],
-# check that it doesn't choke
+'deactivated')
-self.pull()
+with self.repo.internal_cnx() as cnx:
+# check that it doesn't choke
+self.pull(cnx)
 # reinsert syt
 self.add_ldap_entry('uid=syt,ou=People,dc=cubicweb,dc=test',
 { 'objectClass': ['OpenLDAPperson','posixAccount','top','shadowAccount'],
 'cn': 'Sylvain Thenault',
 'sn': 'Thenault',
 'telephoneNumber': '106',
 'displayName': 'sthenault',
 'gecos': 'Sylvain Thenault',
 'mail': ['sylvain.thenault@logilab.fr','syt@logilab.fr'],
 'userPassword': 'syt',
 })
-self.pull()
+with self.repo.internal_cnx() as cnx:
-self.assertEqual(self.execute('Any N WHERE U login "syt", '
+self.pull(cnx)
-'U in_state S, S name N').rows[0][0],
+with self.admin_access.repo_cnx() as cnx:
-'activated')
+self.assertEqual(cnx.execute('Any N WHERE U login "syt", '
+'U in_state S, S name N').rows[0][0],
+'activated')
 def test_reactivate_deleted(self):
 # test reactivating BY HAND the user isn't enough to
 # authenticate, as the native source refuse to authenticate
 # user from other sources
 self.delete_ldap_entry('uid=syt,ou=People,dc=cubicweb,dc=test')
-self.pull()
+with self.repo.internal_cnx() as cnx:
-# reactivate user (which source is still ldap-feed)
+self.pull(cnx)
-user = self.execute('CWUser U WHERE U login "syt"').get_entity(0, 0)
+with self.admin_access.repo_cnx() as cnx:
-user.cw_adapt_to('IWorkflowable').fire_transition('activate')
+# reactivate user (which source is still ldap-feed)
-self.commit()
+user = cnx.execute('CWUser U WHERE U login "syt"').get_entity(0, 0)
-with self.assertRaises(AuthenticationError):
+user.cw_adapt_to('IWorkflowable').fire_transition('activate')
-self.repo.connect('syt', password='syt')
+cnx.commit()
+with self.assertRaises(AuthenticationError):
-# ok now let's try to make it a system user
+self.repo.connect('syt', password='syt')
-self.sexecute('SET X cw_source S WHERE X eid %(x)s, S name "system"', {'x': user.eid})
-self.commit()
+# ok now let's try to make it a system user
+cnx.execute('SET X cw_source S WHERE X eid %(x)s, S name "system"', {'x': user.eid})
+cnx.commit()
 # and that we can now authenticate again
 self.assertRaises(AuthenticationError, self.repo.connect, 'syt', password='toto')
 self.assertTrue(self.repo.connect('syt', password='syt'))
 class LDAPFeedGroupTC(LDAPFeedTestBase):
 """
 A testcase for group support in ldapfeed.
 """
 def test_groups_exist(self):
-rset = self.sexecute('CWGroup X WHERE X name "dir"')
+with self.admin_access.repo_cnx() as cnx:
-self.assertEqual(len(rset), 1)
+rset = cnx.execute('CWGroup X WHERE X name "dir"')
+self.assertEqual(len(rset), 1)
-rset = self.sexecute('CWGroup X WHERE X cw_source S, S name "ldap"')
-self.assertEqual(len(rset), 2)
+rset = cnx.execute('CWGroup X WHERE X cw_source S, S name "ldap"')
+self.assertEqual(len(rset), 2)
 def test_group_deleted(self):
-rset = self.sexecute('CWGroup X WHERE X name "dir"')
+with self.admin_access.repo_cnx() as cnx:
-self.assertEqual(len(rset), 1)
+rset = cnx.execute('CWGroup X WHERE X name "dir"')
+self.assertEqual(len(rset), 1)
 def test_in_group(self):
-rset = self.sexecute('CWGroup X WHERE X name %(name)s', {'name': 'dir'})
+with self.admin_access.repo_cnx() as cnx:
-dirgroup = rset.get_entity(0, 0)
+rset = cnx.execute('CWGroup X WHERE X name %(name)s', {'name': 'dir'})
-self.assertEqual(set(['syt', 'adim']),
+dirgroup = rset.get_entity(0, 0)
-set([u.login for u in dirgroup.reverse_in_group]))
+self.assertEqual(set(['syt', 'adim']),
-rset = self.sexecute('CWGroup X WHERE X name %(name)s', {'name': 'logilab'})
+set([u.login for u in dirgroup.reverse_in_group]))
-logilabgroup = rset.get_entity(0, 0)
+rset = cnx.execute('CWGroup X WHERE X name %(name)s', {'name': 'logilab'})
-self.assertEqual(set(['adim']),
+logilabgroup = rset.get_entity(0, 0)
-set([u.login for u in logilabgroup.reverse_in_group]))
+self.assertEqual(set(['adim']),
+set([u.login for u in logilabgroup.reverse_in_group]))
 def test_group_member_added(self):
-self.pull()
+with self.repo.internal_cnx() as cnx:
-rset = self.sexecute('Any L WHERE U in_group G, G name %(name)s, U login L',
+self.pull(cnx)
-{'name': 'logilab'})
+with self.admin_access.repo_cnx() as cnx:
-self.assertEqual(len(rset), 1)
+rset = cnx.execute('Any L WHERE U in_group G, G name %(name)s, U login L',
-self.assertEqual(rset[0][0], 'adim')
+{'name': 'logilab'})
+self.assertEqual(len(rset), 1)
+self.assertEqual(rset[0][0], 'adim')
 try:
 self.update_ldap_entry('cn=logilab,ou=Group,dc=cubicweb,dc=test',
 {('add', 'memberUid'): ['syt']})
 time.sleep(1.1) # timestamps precision is 1s
-self.pull()
+with self.repo.internal_cnx() as cnx:
+self.pull(cnx)
-rset = self.sexecute('Any L WHERE U in_group G, G name %(name)s, U login L',
-{'name': 'logilab'})
+with self.admin_access.repo_cnx() as cnx:
-self.assertEqual(len(rset), 2)
+rset = cnx.execute('Any L WHERE U in_group G, G name %(name)s, U login L',
-members = set([u[0] for u in rset])
+{'name': 'logilab'})
-self.assertEqual(set(['adim', 'syt']), members)
+self.assertEqual(len(rset), 2)
+members = set([u[0] for u in rset])
+self.assertEqual(set(['adim', 'syt']), members)
 finally:
 # back to normal ldap setup
 self.tearDownClass()
 self.setUpClass()
 def test_group_member_deleted(self):
-self.pull() # ensure we are sync'ed
+with self.repo.internal_cnx() as cnx:
-rset = self.sexecute('Any L WHERE U in_group G, G name %(name)s, U login L',
+self.pull(cnx) # ensure we are sync'ed
-{'name': 'logilab'})
+with self.admin_access.repo_cnx() as cnx:
-self.assertEqual(len(rset), 1)
+rset = cnx.execute('Any L WHERE U in_group G, G name %(name)s, U login L',
-self.assertEqual(rset[0][0], 'adim')
+{'name': 'logilab'})
+self.assertEqual(len(rset), 1)
+self.assertEqual(rset[0][0], 'adim')
 try:
 self.update_ldap_entry('cn=logilab,ou=Group,dc=cubicweb,dc=test',
 {('delete', 'memberUid'): ['adim']})
 time.sleep(1.1) # timestamps precision is 1s
-self.pull()
+with self.repo.internal_cnx() as cnx:
+self.pull(cnx)
-rset = self.sexecute('Any L WHERE U in_group G, G name %(name)s, U login L',
-{'name': 'logilab'})
+with self.admin_access.repo_cnx() as cnx:
-self.assertEqual(len(rset), 0)
+rset = cnx.execute('Any L WHERE U in_group G, G name %(name)s, U login L',
+{'name': 'logilab'})
+self.assertEqual(len(rset), 0)
 finally:
 # back to normal ldap setup
 self.tearDownClass()
 self.setUpClass()

changeset 9793	52647b05bda8
parent 9754	54f422ee3deb
child 9794	61da050d11e4