# HG changeset patch # User Denis Laxalde # Date 1466672731 -7200 # Node ID 5379c5dbc2c52099ccc959b0c555e2881035e887 # Parent 80dec361a5d0bd63d3892ea96328a21ff4bf8629 [test/hooks] pep8 and unittest.main instead in unittest_hooks.py diff -r 80dec361a5d0 -r 5379c5dbc2c5 cubicweb/hooks/test/unittest_hooks.py --- a/cubicweb/hooks/test/unittest_hooks.py Mon Apr 13 14:34:11 2015 +0200 +++ b/cubicweb/hooks/test/unittest_hooks.py Thu Jun 23 11:05:31 2016 +0200 @@ -125,15 +125,15 @@ def test_metadata_created_by(self): with self.admin_access.repo_cnx() as cnx: entity = cnx.create_entity('Bookmark', title=u'wf1', path=u'/view') - cnx.commit() # fire operations - self.assertEqual(len(entity.created_by), 1) # make sure we have only one creator + cnx.commit() # fire operations + self.assertEqual(len(entity.created_by), 1) # make sure we have only one creator self.assertEqual(entity.created_by[0].eid, cnx.user.eid) def test_metadata_owned_by(self): with self.admin_access.repo_cnx() as cnx: entity = cnx.create_entity('Bookmark', title=u'wf1', path=u'/view') - cnx.commit() # fire operations - self.assertEqual(len(entity.owned_by), 1) # make sure we have only one owner + cnx.commit() # fire operations + self.assertEqual(len(entity.owned_by), 1) # make sure we have only one owner self.assertEqual(entity.owned_by[0].eid, cnx.user.eid) def test_user_login_stripped(self): @@ -148,7 +148,6 @@ self.assertEqual(tname, 'jijoe') - class UserGroupHooksTC(CubicWebTC): def test_user_group_synchronization(self): @@ -169,11 +168,11 @@ self.create_user(cnx, 'toto').eid # composite of euser should be owned by the euser regardless of who created it cnx.execute('INSERT EmailAddress X: X address "toto@logilab.fr", U use_email X ' - 'WHERE U login "toto"') + 'WHERE U login "toto"') cnx.commit() self.assertEqual(cnx.execute('Any A WHERE X owned_by U, U use_email X,' - 'U login "toto", X address A')[0][0], - 'toto@logilab.fr') + 'U login "toto", X address A')[0][0], + 'toto@logilab.fr') def test_user_composite_no_owner_on_deleted_entity(self): with self.admin_access.repo_cnx() as cnx: @@ -194,7 +193,6 @@ self.assertFalse(cnx.execute('Any X WHERE X created_by Y, X eid >= %(x)s', {'x': eid})) - class SchemaHooksTC(CubicWebTC): def test_duplicate_etype_error(self): @@ -210,7 +208,7 @@ def test_validation_unique_constraint(self): with self.admin_access.repo_cnx() as cnx: with self.assertRaises(ValidationError) as cm: - cnx.execute('INSERT CWUser X: X login "admin"') + cnx.execute('INSERT CWUser X: X login "admin", X upassword "admin"') ex = cm.exception ex.translate(text_type) self.assertIsInstance(ex.entity, int) @@ -220,5 +218,5 @@ if __name__ == '__main__': - from logilab.common.testlib import unittest_main - unittest_main() + import unittest + unittest.main()