# HG changeset patch # User Mads Kiilerich # Date 1452007812 -3600 # Node ID 6077644fca4590cac174255d40e0cf5576f9b6ff # Parent 8eebcf50fdd5b56eae26291aec2d27c6cf0dbf45 tests: permission names are strings, not unicode - avoid extra conversions diff -r 8eebcf50fdd5 -r 6077644fca45 kallithea/tests/models/test_permissions.py --- a/kallithea/tests/models/test_permissions.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/models/test_permissions.py Tue Jan 05 16:30:12 2016 +0100 @@ -70,9 +70,9 @@ u1_auth = AuthUser(user_id=self.u1.user_id) perms = { 'repositories_groups': {}, - 'global': set([u'hg.create.repository', u'repository.read', - u'hg.register.manual_activate']), - 'repositories': {HG_REPO: u'repository.read'} + 'global': set(['hg.create.repository', 'repository.read', + 'hg.register.manual_activate']), + 'repositories': {HG_REPO: 'repository.read'} } self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], perms['repositories'][HG_REPO]) @@ -89,8 +89,8 @@ a1_auth = AuthUser(user_id=self.a1.user_id) perms = { 'repositories_groups': {}, - 'global': set([u'hg.admin', 'hg.create.write_on_repogroup.true']), - 'repositories': {HG_REPO: u'repository.admin'} + 'global': set(['hg.admin', 'hg.create.write_on_repogroup.true']), + 'repositories': {HG_REPO: 'repository.admin'} } self.assertEqual(a1_auth.permissions['repositories'][HG_REPO], perms['repositories'][HG_REPO]) @@ -111,7 +111,7 @@ perms = { 'repositories_groups': {u'test1': 'group.read', u'test2': 'group.read'}, 'global': set(Permission.DEFAULT_USER_PERMISSIONS), - 'repositories': {HG_REPO: u'repository.read'} + 'repositories': {HG_REPO: 'repository.read'} } self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], perms['repositories'][HG_REPO]) @@ -158,9 +158,9 @@ u1_auth = AuthUser(user_id=self.u1.user_id) perms = { 'repositories_groups': {}, - 'global': set([u'hg.create.repository', u'repository.read', - u'hg.register.manual_activate']), - 'repositories': {HG_REPO: u'repository.read'} + 'global': set(['hg.create.repository', 'repository.read', + 'hg.register.manual_activate']), + 'repositories': {HG_REPO: 'repository.read'} } self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], new_perm) @@ -181,9 +181,9 @@ u3_auth = AuthUser(user_id=self.u3.user_id) perms = { 'repositories_groups': {}, - 'global': set([u'hg.create.repository', u'repository.read', - u'hg.register.manual_activate']), - 'repositories': {HG_REPO: u'repository.read'} + 'global': set(['hg.create.repository', 'repository.read', + 'hg.register.manual_activate']), + 'repositories': {HG_REPO: 'repository.read'} } self.assertEqual(u3_auth.permissions['repositories'][HG_REPO], new_perm_gr) @@ -215,9 +215,9 @@ u1_auth = AuthUser(user_id=self.u1.user_id) perms = { 'repositories_groups': {}, - 'global': set([u'hg.create.repository', u'repository.read', - u'hg.register.manual_activate']), - 'repositories': {HG_REPO: u'repository.write'} + 'global': set(['hg.create.repository', 'repository.read', + 'hg.register.manual_activate']), + 'repositories': {HG_REPO: 'repository.write'} } self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], new_perm_h)