Mercurial > kallithea
changeset 5631:bd4840ad72d3
tests: more consistently use unicode where unicode is expected
Nothing but extra u annotation to turn str constants into unicode.
This has been verified by hacking sqlalchemy to fail if wrong string types are passed.
line wrap: on
line diff
--- a/kallithea/tests/__init__.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/__init__.py Tue Jan 05 16:30:12 2016 +0100 @@ -100,14 +100,14 @@ TEST_USER_REGULAR2_PASS = 'test12' TEST_USER_REGULAR2_EMAIL = 'test_regular2@example.com' -HG_REPO = 'vcs_test_hg' -GIT_REPO = 'vcs_test_git' +HG_REPO = u'vcs_test_hg' +GIT_REPO = u'vcs_test_git' -NEW_HG_REPO = 'vcs_test_hg_new' -NEW_GIT_REPO = 'vcs_test_git_new' +NEW_HG_REPO = u'vcs_test_hg_new' +NEW_GIT_REPO = u'vcs_test_git_new' -HG_FORK = 'vcs_test_hg_fork' -GIT_FORK = 'vcs_test_git_fork' +HG_FORK = u'vcs_test_hg_fork' +GIT_FORK = u'vcs_test_git_fork' ## VCS SCM_TESTS = ['hg', 'git']
--- a/kallithea/tests/api/api_base.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/api/api_base.py Tue Jan 05 16:30:12 2016 +0100 @@ -38,8 +38,8 @@ API_URL = '/_admin/api' -TEST_USER_GROUP = 'test_user_group' -TEST_REPO_GROUP = 'test_repo_group' +TEST_USER_GROUP = u'test_user_group' +TEST_REPO_GROUP = u'test_repo_group' fixture = Fixture() @@ -99,8 +99,8 @@ username='test-api', password='test', email='test@example.com', - firstname='first', - lastname='last' + firstname=u'first', + lastname=u'last' ) Session().commit() cls.TEST_USER_LOGIN = cls.test_user.username @@ -278,7 +278,7 @@ self._compare_error(id_, expected, given=response.body) def test_api_pull(self): - repo_name = 'test_pull' + repo_name = u'test_pull' r = fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) r.clone_uri = os.path.join(TESTS_TMP_PATH, self.REPO) Session.add(r) @@ -368,7 +368,7 @@ self._compare_ok(id_, expected, given=response.body) def test_api_lock_repo_lock_aquire_by_non_admin(self): - repo_name = 'api_delete_me' + repo_name = u'api_delete_me' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE, cur_user=self.TEST_USER_LOGIN) try: @@ -390,7 +390,7 @@ fixture.destroy_repo(repo_name) def test_api_lock_repo_lock_aquire_non_admin_with_userid(self): - repo_name = 'api_delete_me' + repo_name = u'api_delete_me' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE, cur_user=self.TEST_USER_LOGIN) try: @@ -465,7 +465,7 @@ self._compare_ok(id_, expected, given=response.body) def test_api_lock_repo_lock_optional_not_locked(self): - repo_name = 'api_not_locked' + repo_name = u'api_not_locked' repo = fixture.create_repo(repo_name, repo_type=self.REPO_TYPE, cur_user=self.TEST_USER_LOGIN) self.assertEqual(repo.locked, [None, None]) @@ -516,7 +516,7 @@ self._compare_ok(id_, expected, given=response.body) def test_api_get_locks_with_one_locked_repo(self): - repo_name = 'api_delete_me' + repo_name = u'api_delete_me' repo = fixture.create_repo(repo_name, repo_type=self.REPO_TYPE, cur_user=self.TEST_USER_LOGIN) Repository.lock(repo, User.get_by_username(self.TEST_USER_LOGIN).user_id) @@ -529,7 +529,7 @@ fixture.destroy_repo(repo_name) def test_api_get_locks_with_one_locked_repo_for_specific_user(self): - repo_name = 'api_delete_me' + repo_name = u'api_delete_me' repo = fixture.create_repo(repo_name, repo_type=self.REPO_TYPE, cur_user=self.TEST_USER_LOGIN) Repository.lock(repo, User.get_by_username(self.TEST_USER_LOGIN).user_id) @@ -766,7 +766,7 @@ self._compare_error(id_, expected, given=response.body) def test_api_get_repo(self): - new_group = 'some_new_group' + new_group = u'some_new_group' make_user_group(new_group) RepoModel().grant_user_group_permission(repo=self.REPO, group_name=new_group, @@ -975,7 +975,7 @@ RepoModel().revoke_user_permission(self.REPO, self.TEST_USER_LOGIN) def test_api_create_repo(self): - repo_name = 'api-repo' + repo_name = u'api-repo' id_, params = _build_data(self.apikey, 'create_repo', repo_name=repo_name, owner=TEST_USER_ADMIN_LOGIN, @@ -995,7 +995,7 @@ fixture.destroy_repo(repo_name) def test_api_create_repo_and_repo_group(self): - repo_name = 'my_gr/api-repo' + repo_name = u'my_gr/api-repo' id_, params = _build_data(self.apikey, 'create_repo', repo_name=repo_name, owner=TEST_USER_ADMIN_LOGIN, @@ -1012,11 +1012,11 @@ expected = ret self._compare_ok(id_, expected, given=response.body) fixture.destroy_repo(repo_name) - fixture.destroy_repo_group('my_gr') + fixture.destroy_repo_group(u'my_gr') def test_api_create_repo_in_repo_group_without_permission(self): - repo_group_name = '%s/api-repo-repo' % TEST_REPO_GROUP - repo_name = '%s/api-repo' % repo_group_name + repo_group_name = u'%s/api-repo-repo' % TEST_REPO_GROUP + repo_name = u'%s/api-repo' % repo_group_name rg = fixture.create_repo_group(repo_group_name) Session().commit() @@ -1048,7 +1048,7 @@ fixture.destroy_repo_group(repo_group_name) def test_api_create_repo_unknown_owner(self): - repo_name = 'api-repo' + repo_name = u'api-repo' owner = 'i-dont-exist' id_, params = _build_data(self.apikey, 'create_repo', repo_name=repo_name, @@ -1060,7 +1060,7 @@ self._compare_error(id_, expected, given=response.body) def test_api_create_repo_dont_specify_owner(self): - repo_name = 'api-repo' + repo_name = u'api-repo' owner = 'i-dont-exist' id_, params = _build_data(self.apikey, 'create_repo', repo_name=repo_name, @@ -1080,7 +1080,7 @@ fixture.destroy_repo(repo_name) def test_api_create_repo_by_non_admin(self): - repo_name = 'api-repo' + repo_name = u'api-repo' owner = 'i-dont-exist' id_, params = _build_data(self.apikey_regular, 'create_repo', repo_name=repo_name, @@ -1100,7 +1100,7 @@ fixture.destroy_repo(repo_name) def test_api_create_repo_by_non_admin_specify_owner(self): - repo_name = 'api-repo' + repo_name = u'api-repo' owner = 'i-dont-exist' id_, params = _build_data(self.apikey_regular, 'create_repo', repo_name=repo_name, @@ -1124,7 +1124,7 @@ @mock.patch.object(RepoModel, 'create', crash) def test_api_create_repo_exception_occurred(self): - repo_name = 'api-repo' + repo_name = u'api-repo' id_, params = _build_data(self.apikey, 'create_repo', repo_name=repo_name, owner=TEST_USER_ADMIN_LOGIN, @@ -1135,7 +1135,7 @@ @parameterized.expand([ ('owner', {'owner': TEST_USER_REGULAR_LOGIN}), - ('description', {'description': 'new description'}), + ('description', {'description': u'new description'}), ('active', {'active': True}), ('active', {'active': False}), ('clone_uri', {'clone_uri': 'http://example.com/repo'}), @@ -1144,11 +1144,11 @@ ('enable_statistics', {'enable_statistics': True}), ('enable_locking', {'enable_locking': True}), ('enable_downloads', {'enable_downloads': True}), - ('name', {'name': 'new_repo_name'}), - ('repo_group', {'group': 'test_group_for_update'}), + ('name', {'name': u'new_repo_name'}), + ('repo_group', {'group': u'test_group_for_update'}), ]) def test_api_update_repo(self, changing_attr, updates): - repo_name = 'api_update_me' + repo_name = u'api_update_me' repo = fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) if changing_attr == 'repo_group': fixture.create_repo_group(updates['group']) @@ -1159,7 +1159,7 @@ if changing_attr == 'name': repo_name = updates['name'] if changing_attr == 'repo_group': - repo_name = '/'.join([updates['group'], repo_name]) + repo_name = u'/'.join([updates['group'], repo_name]) try: expected = { 'msg': 'updated repo ID:%s %s' % (repo.repo_id, repo_name), @@ -1172,7 +1172,7 @@ fixture.destroy_repo_group(updates['group']) def test_api_update_repo_repo_group_does_not_exist(self): - repo_name = 'admin_owned' + repo_name = u'admin_owned' fixture.create_repo(repo_name) updates = {'group': 'test_group_for_update'} id_, params = _build_data(self.apikey, 'update_repo', @@ -1185,7 +1185,7 @@ fixture.destroy_repo(repo_name) def test_api_update_repo_regular_user_not_allowed(self): - repo_name = 'admin_owned' + repo_name = u'admin_owned' fixture.create_repo(repo_name) updates = {'active': False} id_, params = _build_data(self.apikey_regular, 'update_repo', @@ -1199,7 +1199,7 @@ @mock.patch.object(RepoModel, 'update', crash) def test_api_update_repo_exception_occurred(self): - repo_name = 'api_update_me' + repo_name = u'api_update_me' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) id_, params = _build_data(self.apikey, 'update_repo', repoid=repo_name, owner=TEST_USER_ADMIN_LOGIN,) @@ -1211,8 +1211,8 @@ fixture.destroy_repo(repo_name) def test_api_update_repo_regular_user_change_repo_name(self): - repo_name = 'admin_owned' - new_repo_name = 'new_repo_name' + repo_name = u'admin_owned' + new_repo_name = u'new_repo_name' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) RepoModel().grant_user_permission(repo=repo_name, user=self.TEST_USER_LOGIN, @@ -1231,8 +1231,8 @@ fixture.destroy_repo(new_repo_name) def test_api_update_repo_regular_user_change_repo_name_allowed(self): - repo_name = 'admin_owned' - new_repo_name = 'new_repo_name' + repo_name = u'admin_owned' + new_repo_name = u'new_repo_name' repo = fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) RepoModel().grant_user_permission(repo=repo_name, user=self.TEST_USER_LOGIN, @@ -1254,7 +1254,7 @@ fixture.destroy_repo(new_repo_name) def test_api_update_repo_regular_user_change_owner(self): - repo_name = 'admin_owned' + repo_name = u'admin_owned' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) RepoModel().grant_user_permission(repo=repo_name, user=self.TEST_USER_LOGIN, @@ -1270,7 +1270,7 @@ fixture.destroy_repo(repo_name) def test_api_delete_repo(self): - repo_name = 'api_delete_me' + repo_name = u'api_delete_me' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) id_, params = _build_data(self.apikey, 'delete_repo', @@ -1288,7 +1288,7 @@ fixture.destroy_repo(repo_name) def test_api_delete_repo_by_non_admin(self): - repo_name = 'api_delete_me' + repo_name = u'api_delete_me' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE, cur_user=self.TEST_USER_LOGIN) id_, params = _build_data(self.apikey_regular, 'delete_repo', @@ -1306,7 +1306,7 @@ fixture.destroy_repo(repo_name) def test_api_delete_repo_by_non_admin_no_permission(self): - repo_name = 'api_delete_me' + repo_name = u'api_delete_me' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) try: id_, params = _build_data(self.apikey_regular, 'delete_repo', @@ -1318,7 +1318,7 @@ fixture.destroy_repo(repo_name) def test_api_delete_repo_exception_occurred(self): - repo_name = 'api_delete_me' + repo_name = u'api_delete_me' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) try: with mock.patch.object(RepoModel, 'delete', crash): @@ -1332,7 +1332,7 @@ fixture.destroy_repo(repo_name) def test_api_fork_repo(self): - fork_name = 'api-repo-fork' + fork_name = u'api-repo-fork' id_, params = _build_data(self.apikey, 'fork_repo', repoid=self.REPO, fork_name=fork_name, @@ -1351,7 +1351,7 @@ fixture.destroy_repo(fork_name) def test_api_fork_repo_non_admin(self): - fork_name = 'api-repo-fork' + fork_name = u'api-repo-fork' id_, params = _build_data(self.apikey_regular, 'fork_repo', repoid=self.REPO, fork_name=fork_name, @@ -1369,7 +1369,7 @@ fixture.destroy_repo(fork_name) def test_api_fork_repo_non_admin_specify_owner(self): - fork_name = 'api-repo-fork' + fork_name = u'api-repo-fork' id_, params = _build_data(self.apikey_regular, 'fork_repo', repoid=self.REPO, fork_name=fork_name, @@ -1384,7 +1384,7 @@ RepoModel().grant_user_permission(repo=self.REPO, user=self.TEST_USER_LOGIN, perm='repository.none') - fork_name = 'api-repo-fork' + fork_name = u'api-repo-fork' id_, params = _build_data(self.apikey_regular, 'fork_repo', repoid=self.REPO, fork_name=fork_name, @@ -1398,7 +1398,7 @@ ('write', 'repository.write'), ('admin', 'repository.admin')]) def test_api_fork_repo_non_admin_no_create_repo_permission(self, name, perm): - fork_name = 'api-repo-fork' + fork_name = u'api-repo-fork' # regardless of base repository permission, forking is disallowed # when repository creation is disabled RepoModel().grant_user_permission(repo=self.REPO, @@ -1416,7 +1416,7 @@ fixture.destroy_repo(fork_name) def test_api_fork_repo_unknown_owner(self): - fork_name = 'api-repo-fork' + fork_name = u'api-repo-fork' owner = 'i-dont-exist' id_, params = _build_data(self.apikey, 'fork_repo', repoid=self.REPO, @@ -1428,11 +1428,11 @@ self._compare_error(id_, expected, given=response.body) def test_api_fork_repo_fork_exists(self): - fork_name = 'api-repo-fork' + fork_name = u'api-repo-fork' fixture.create_fork(self.REPO, fork_name) try: - fork_name = 'api-repo-fork' + fork_name = u'api-repo-fork' id_, params = _build_data(self.apikey, 'fork_repo', repoid=self.REPO, @@ -1461,7 +1461,7 @@ @mock.patch.object(RepoModel, 'create_fork', crash) def test_api_fork_repo_exception_occurred(self): - fork_name = 'api-repo-fork' + fork_name = u'api-repo-fork' id_, params = _build_data(self.apikey, 'fork_repo', repoid=self.REPO, fork_name=fork_name, @@ -1490,7 +1490,7 @@ self._compare_ok(id_, expected, given=response.body) def test_api_get_user_groups(self): - gr_name = 'test_user_group2' + gr_name = u'test_user_group2' make_user_group(gr_name) id_, params = _build_data(self.apikey, 'get_user_groups', ) @@ -1498,7 +1498,7 @@ try: expected = [] - for gr_name in [TEST_USER_GROUP, 'test_user_group2']: + for gr_name in [TEST_USER_GROUP, u'test_user_group2']: user_group = UserGroupModel().get_group(gr_name) ret = user_group.get_api_data() expected.append(ret) @@ -1507,7 +1507,7 @@ fixture.destroy_user_group(gr_name) def test_api_create_user_group(self): - group_name = 'some_new_group' + group_name = u'some_new_group' id_, params = _build_data(self.apikey, 'create_user_group', group_name=group_name) response = api_call(self, params) @@ -1533,7 +1533,7 @@ @mock.patch.object(UserGroupModel, 'create', crash) def test_api_get_user_group_exception_occurred(self): - group_name = 'exception_happens' + group_name = u'exception_happens' id_, params = _build_data(self.apikey, 'create_user_group', group_name=group_name) response = api_call(self, params) @@ -1541,13 +1541,13 @@ expected = 'failed to create group `%s`' % group_name self._compare_error(id_, expected, given=response.body) - @parameterized.expand([('group_name', {'group_name': 'new_group_name'}), - ('group_name', {'group_name': 'test_group_for_update'}), + @parameterized.expand([('group_name', {'group_name': u'new_group_name'}), + ('group_name', {'group_name': u'test_group_for_update'}), ('owner', {'owner': TEST_USER_REGULAR_LOGIN}), ('active', {'active': False}), ('active', {'active': True})]) def test_api_update_user_group(self, changing_attr, updates): - gr_name = 'test_group_for_update' + gr_name = u'test_group_for_update' user_group = fixture.create_user_group(gr_name) id_, params = _build_data(self.apikey, 'update_user_group', usergroupid=gr_name, **updates) @@ -1567,7 +1567,7 @@ @mock.patch.object(UserGroupModel, 'update', crash) def test_api_update_user_group_exception_occurred(self): - gr_name = 'test_group' + gr_name = u'test_group' fixture.create_user_group(gr_name) id_, params = _build_data(self.apikey, 'update_user_group', usergroupid=gr_name) @@ -1579,7 +1579,7 @@ fixture.destroy_user_group(gr_name) def test_api_add_user_to_user_group(self): - gr_name = 'test_group' + gr_name = u'test_group' fixture.create_user_group(gr_name) id_, params = _build_data(self.apikey, 'add_user_to_user_group', usergroupid=gr_name, @@ -1606,7 +1606,7 @@ @mock.patch.object(UserGroupModel, 'add_user_to_group', crash) def test_api_add_user_to_user_group_exception_occurred(self): - gr_name = 'test_group' + gr_name = u'test_group' fixture.create_user_group(gr_name) id_, params = _build_data(self.apikey, 'add_user_to_user_group', usergroupid=gr_name, @@ -1620,7 +1620,7 @@ fixture.destroy_user_group(gr_name) def test_api_remove_user_from_user_group(self): - gr_name = 'test_group_3' + gr_name = u'test_group_3' gr = fixture.create_user_group(gr_name) UserGroupModel().add_user_to_group(gr, user=TEST_USER_ADMIN_LOGIN) Session().commit() @@ -1641,7 +1641,7 @@ @mock.patch.object(UserGroupModel, 'remove_user_from_group', crash) def test_api_remove_user_from_user_group_exception_occurred(self): - gr_name = 'test_group_3' + gr_name = u'test_group_3' gr = fixture.create_user_group(gr_name) UserGroupModel().add_user_to_group(gr, user=TEST_USER_ADMIN_LOGIN) Session().commit() @@ -1656,7 +1656,7 @@ fixture.destroy_user_group(gr_name) def test_api_delete_user_group(self): - gr_name = 'test_group' + gr_name = u'test_group' ugroup = fixture.create_user_group(gr_name) gr_id = ugroup.users_group_id id_, params = _build_data(self.apikey, 'delete_user_group', @@ -1675,7 +1675,7 @@ fixture.destroy_user_group(gr_name) def test_api_delete_user_group_that_is_assigned(self): - gr_name = 'test_group' + gr_name = u'test_group' ugroup = fixture.create_user_group(gr_name) gr_id = ugroup.users_group_id @@ -1695,7 +1695,7 @@ fixture.destroy_user_group(gr_name) def test_api_delete_user_group_exception_occurred(self): - gr_name = 'test_group' + gr_name = u'test_group' ugroup = fixture.create_user_group(gr_name) gr_id = ugroup.users_group_id id_, params = _build_data(self.apikey, 'delete_user_group',
--- a/kallithea/tests/fixture.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/fixture.py Tue Jan 05 16:30:12 2016 +0100 @@ -76,7 +76,7 @@ repo_type='hg', clone_uri='', repo_group=u'-1', - repo_description='DESC', + repo_description=u'DESC', repo_private=False, repo_landing_rev='rev:tip', repo_copy_permissions=False, @@ -95,7 +95,7 @@ def _get_group_create_params(self, **custom): defs = dict( group_name=None, - group_description='DESC', + group_description=u'DESC', group_parent_id=None, perms_updates=[], perms_new=[], @@ -111,8 +111,8 @@ username=name, password='qweqwe', email='%s+test@example.com' % name, - firstname='TestUser', - lastname='Test', + firstname=u'TestUser', + lastname=u'Test', active=True, admin=False, extern_type='internal', @@ -125,7 +125,7 @@ def _get_user_group_create_params(self, name, **custom): defs = dict( users_group_name=name, - user_group_description='DESC', + user_group_description=u'DESC', users_group_active=True, user_group_data={}, )
--- a/kallithea/tests/functional/test_admin_notifications.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_admin_notifications.py Tue Jan 05 16:30:12 2016 +0100 @@ -16,7 +16,7 @@ u1 = UserModel().create_or_update(username='u1', password='qweqwe', email='u1@example.com', - firstname='u1', lastname='u1') + firstname=u'u1', lastname=u'u1') u1 = u1.user_id response = self.app.get(url('notifications')) @@ -35,10 +35,10 @@ u1 = UserModel().create_or_update(username='u1', password='qweqwe', email='u1@example.com', - firstname='u1', lastname='u1') + firstname=u'u1', lastname=u'u1') u2 = UserModel().create_or_update(username='u2', password='qweqwe', email='u2@example.com', - firstname='u2', lastname='u2') + firstname=u'u2', lastname=u'u2') # make notifications notification = NotificationModel().create(created_by=cur_user, @@ -69,10 +69,10 @@ cur_user = self._get_logged_user() u1 = UserModel().create_or_update(username='u1', password='qweqwe', email='u1@example.com', - firstname='u1', lastname='u1') + firstname=u'u1', lastname=u'u1') u2 = UserModel().create_or_update(username='u2', password='qweqwe', email='u2@example.com', - firstname='u2', lastname='u2') + firstname=u'u2', lastname=u'u2') subject = u'test' notif_body = u'hi there'
--- a/kallithea/tests/functional/test_admin_repos.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_admin_repos.py Tue Jan 05 16:30:12 2016 +0100 @@ -52,7 +52,7 @@ def test_create(self): self.log_user() repo_name = self.NEW_REPO - description = 'description for newly created repo' + description = u'description for newly created repo' response = self.app.post(url('repos'), fixture._get_repo_create_params(repo_private=False, repo_name=repo_name, @@ -91,15 +91,15 @@ self.log_user() ## create GROUP - group_name = 'sometest_%s' % self.REPO_TYPE + group_name = u'sometest_%s' % self.REPO_TYPE gr = RepoGroupModel().create(group_name=group_name, - group_description='test', + group_description=u'test', owner=TEST_USER_ADMIN_LOGIN) Session().commit() - repo_name = 'ingroup' + repo_name = u'ingroup' repo_name_full = RepoGroup.url_sep().join([group_name, repo_name]) - description = 'description for newly created repo' + description = u'description for newly created repo' response = self.app.post(url('repos'), fixture._get_repo_create_params(repo_private=False, repo_name=repo_name, @@ -162,21 +162,21 @@ Session().commit() ## create GROUP - group_name = 'reg_sometest_%s' % self.REPO_TYPE + group_name = u'reg_sometest_%s' % self.REPO_TYPE gr = RepoGroupModel().create(group_name=group_name, - group_description='test', + group_description=u'test', owner=TEST_USER_ADMIN_LOGIN) Session().commit() - group_name_allowed = 'reg_sometest_allowed_%s' % self.REPO_TYPE + group_name_allowed = u'reg_sometest_allowed_%s' % self.REPO_TYPE gr_allowed = RepoGroupModel().create(group_name=group_name_allowed, - group_description='test', + group_description=u'test', owner=TEST_USER_REGULAR_LOGIN) Session().commit() - repo_name = 'ingroup' + repo_name = u'ingroup' repo_name_full = RepoGroup.url_sep().join([group_name, repo_name]) - description = 'description for newly created repo' + description = u'description for newly created repo' response = self.app.post(url('repos'), fixture._get_repo_create_params(repo_private=False, repo_name=repo_name, @@ -188,9 +188,9 @@ response.mustcontain('Invalid value') # user is allowed to create in this group - repo_name = 'ingroup' + repo_name = u'ingroup' repo_name_full = RepoGroup.url_sep().join([group_name_allowed, repo_name]) - description = 'description for newly created repo' + description = u'description for newly created repo' response = self.app.post(url('repos'), fixture._get_repo_create_params(repo_private=False, repo_name=repo_name, @@ -239,9 +239,9 @@ self.log_user() ## create GROUP - group_name = 'sometest_%s' % self.REPO_TYPE + group_name = u'sometest_%s' % self.REPO_TYPE gr = RepoGroupModel().create(group_name=group_name, - group_description='test', + group_description=u'test', owner=TEST_USER_ADMIN_LOGIN) perm = Permission.get_by_key('repository.write') RepoGroupModel().grant_user_permission(gr, TEST_USER_REGULAR_LOGIN, perm) @@ -249,9 +249,9 @@ ## add repo permissions Session().commit() - repo_name = 'ingroup_inherited_%s' % self.REPO_TYPE + repo_name = u'ingroup_inherited_%s' % self.REPO_TYPE repo_name_full = RepoGroup.url_sep().join([group_name, repo_name]) - description = 'description for newly created repo' + description = u'description for newly created repo' response = self.app.post(url('repos'), fixture._get_repo_create_params(repo_private=False, repo_name=repo_name, @@ -304,7 +304,7 @@ def test_create_remote_repo_wrong_clone_uri(self): self.log_user() repo_name = self.NEW_REPO - description = 'description for newly created repo' + description = u'description for newly created repo' response = self.app.post(url('repos'), fixture._get_repo_create_params(repo_private=False, repo_name=repo_name, @@ -318,7 +318,7 @@ def test_create_remote_repo_wrong_clone_uri_hg_svn(self): self.log_user() repo_name = self.NEW_REPO - description = 'description for newly created repo' + description = u'description for newly created repo' response = self.app.post(url('repos'), fixture._get_repo_create_params(repo_private=False, repo_name=repo_name, @@ -331,8 +331,8 @@ def test_delete(self): self.log_user() - repo_name = 'vcs_test_new_to_delete_%s' % self.REPO_TYPE - description = 'description for newly created repo' + repo_name = u'vcs_test_new_to_delete_%s' % self.REPO_TYPE + description = u'description for newly created repo' response = self.app.post(url('repos'), fixture._get_repo_create_params(repo_private=False, repo_type=self.REPO_TYPE, @@ -496,7 +496,7 @@ def test_set_fork_of_other_repo(self): self.log_user() - other_repo = 'other_%s' % self.REPO_TYPE + other_repo = u'other_%s' % self.REPO_TYPE fixture.create_repo(other_repo, repo_type=self.REPO_TYPE) repo = Repository.get_by_repo_name(self.REPO) repo2 = Repository.get_by_repo_name(other_repo) @@ -568,7 +568,7 @@ user = User.get(usr['user_id']) - repo_name = self.NEW_REPO+'no_perms' + repo_name = self.NEW_REPO + u'no_perms' description = 'description for newly created repo' response = self.app.post(url('repos'), fixture._get_repo_create_params(repo_private=False,
--- a/kallithea/tests/functional/test_admin_user_groups.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_admin_user_groups.py Tue Jan 05 16:30:12 2016 +0100 @@ -3,7 +3,7 @@ from kallithea.model.db import UserGroup, UserGroupToPerm, Permission from kallithea.model.meta import Session -TEST_USER_GROUP = 'admins_test' +TEST_USER_GROUP = u'admins_test' class TestAdminUsersGroupsController(TestController): @@ -18,7 +18,7 @@ users_group_name = TEST_USER_GROUP response = self.app.post(url('users_groups'), {'users_group_name': users_group_name, - 'user_group_description': 'DESC', + 'user_group_description': u'DESC', 'active': True, '_authentication_token': self.authentication_token()}) response.follow() @@ -43,7 +43,7 @@ users_group_name = TEST_USER_GROUP + 'another' response = self.app.post(url('users_groups'), {'users_group_name':users_group_name, - 'user_group_description': 'DESC', + 'user_group_description': u'DESC', 'active': True, '_authentication_token': self.authentication_token()}) response.follow() @@ -67,7 +67,7 @@ users_group_name = TEST_USER_GROUP + 'another2' response = self.app.post(url('users_groups'), {'users_group_name': users_group_name, - 'user_group_description': 'DESC', + 'user_group_description': u'DESC', 'active': True, '_authentication_token': self.authentication_token()}) response.follow() @@ -140,7 +140,7 @@ users_group_name = TEST_USER_GROUP + 'another2' response = self.app.post(url('users_groups'), {'users_group_name': users_group_name, - 'user_group_description': 'DESC', + 'user_group_description': u'DESC', 'active': True, '_authentication_token': self.authentication_token()}) response.follow()
--- a/kallithea/tests/functional/test_admin_users.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_admin_users.py Tue Jan 05 16:30:12 2016 +0100 @@ -45,8 +45,8 @@ username = 'newtestuser' password = 'test12' password_confirmation = password - name = 'name' - lastname = 'lastname' + name = u'name' + lastname = u'lastname' email = 'mail@example.com' response = self.app.post(url('users'), @@ -81,8 +81,8 @@ self.log_user() username = 'new_user' password = '' - name = 'name' - lastname = 'lastname' + name = u'name' + lastname = u'lastname' email = 'errmail.example.com' response = self.app.post(url('users'), {'username': username, @@ -175,7 +175,7 @@ def test_delete_repo_err(self): self.log_user() username = 'repoerr' - reponame = 'repoerr_fail' + reponame = u'repoerr_fail' fixture.create_user(name=username) fixture.create_repo(name=reponame, cur_user=username) @@ -200,7 +200,7 @@ def test_delete_repo_group_err(self): self.log_user() username = 'repogrouperr' - groupname = 'repogroup_fail' + groupname = u'repogroup_fail' fixture.create_user(name=username) fixture.create_repo_group(name=groupname, cur_user=username) @@ -229,7 +229,7 @@ def test_delete_user_group_err(self): self.log_user() username = 'usergrouperr' - groupname = 'usergroup_fail' + groupname = u'usergroup_fail' fixture.create_user(name=username) ug = fixture.create_user_group(name=groupname, cur_user=username) @@ -267,8 +267,8 @@ perm_create = Permission.get_by_key('hg.create.repository') user = UserModel().create_or_update(username='dummy', password='qwe', - email='dummy', firstname='a', - lastname='b') + email='dummy', firstname=u'a', + lastname=u'b') Session().commit() uid = user.user_id @@ -298,8 +298,8 @@ perm_create = Permission.get_by_key('hg.create.repository') user = UserModel().create_or_update(username='dummy', password='qwe', - email='dummy', firstname='a', - lastname='b') + email='dummy', firstname=u'a', + lastname=u'b') Session().commit() uid = user.user_id @@ -327,8 +327,8 @@ perm_fork = Permission.get_by_key('hg.fork.repository') user = UserModel().create_or_update(username='dummy', password='qwe', - email='dummy', firstname='a', - lastname='b') + email='dummy', firstname=u'a', + lastname=u'b') Session().commit() uid = user.user_id @@ -358,8 +358,8 @@ perm_fork = Permission.get_by_key('hg.fork.repository') user = UserModel().create_or_update(username='dummy', password='qwe', - email='dummy', firstname='a', - lastname='b') + email='dummy', firstname=u'a', + lastname=u'b') Session().commit() uid = user.user_id
--- a/kallithea/tests/functional/test_compare.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_compare.py Tue Jan 05 16:30:12 2016 +0100 @@ -26,7 +26,7 @@ def test_compare_forks_on_branch_extra_commits_hg(self): self.log_user() - repo1 = fixture.create_repo('one', repo_type='hg', + repo1 = fixture.create_repo(u'one', repo_type='hg', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN) self.r1_id = repo1.repo_id @@ -36,7 +36,7 @@ parent=None, newfile=True) #fork this repo - repo2 = fixture.create_fork('one', 'one-fork') + repo2 = fixture.create_fork(u'one', u'one-fork') self.r2_id = repo2.repo_id #add two extra commit into fork @@ -77,7 +77,7 @@ def test_compare_forks_on_branch_extra_commits_git(self): self.log_user() - repo1 = fixture.create_repo('one-git', repo_type='git', + repo1 = fixture.create_repo(u'one-git', repo_type='git', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN) self.r1_id = repo1.repo_id @@ -87,7 +87,7 @@ parent=None, newfile=True) #fork this repo - repo2 = fixture.create_fork('one-git', 'one-git-fork') + repo2 = fixture.create_fork(u'one-git', u'one-git-fork') self.r2_id = repo2.repo_id #add two extra commit into fork @@ -129,7 +129,7 @@ def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self): self.log_user() - repo1 = fixture.create_repo('one', repo_type='hg', + repo1 = fixture.create_repo(u'one', repo_type='hg', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN) @@ -141,7 +141,7 @@ parent=None, newfile=True) #fork this repo - repo2 = fixture.create_fork('one', 'one-fork') + repo2 = fixture.create_fork(u'one', u'one-fork') self.r2_id = repo2.repo_id #now commit something to origin repo @@ -188,7 +188,7 @@ def test_compare_forks_on_branch_extra_commits_origin_has_incomming_git(self): self.log_user() - repo1 = fixture.create_repo('one-git', repo_type='git', + repo1 = fixture.create_repo(u'one-git', repo_type='git', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN) @@ -200,7 +200,7 @@ parent=None, newfile=True) #fork this repo - repo2 = fixture.create_fork('one-git', 'one-git-fork') + repo2 = fixture.create_fork(u'one-git', u'one-git-fork') self.r2_id = repo2.repo_id #now commit something to origin repo @@ -259,7 +259,7 @@ #make repo1, and cs1+cs2 self.log_user() - repo1 = fixture.create_repo('repo1', repo_type='hg', + repo1 = fixture.create_repo(u'repo1', repo_type='hg', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN) self.r1_id = repo1.repo_id @@ -272,7 +272,7 @@ content='line1\nline2\n', message='commit2', vcs_type='hg', parent=cs0) #fork this repo - repo2 = fixture.create_fork('repo1', 'repo1-fork') + repo2 = fixture.create_fork(u'repo1', u'repo1-fork') self.r2_id = repo2.repo_id #now make cs3-6 cs2 = fixture.commit_change(repo1.repo_name, filename='file1', @@ -326,7 +326,7 @@ # #make repo1, and cs1+cs2 self.log_user() - repo1 = fixture.create_repo('repo1', repo_type='hg', + repo1 = fixture.create_repo(u'repo1', repo_type='hg', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN) self.r1_id = repo1.repo_id @@ -339,7 +339,7 @@ content='line1\nline2\n', message='commit2', vcs_type='hg', parent=cs0) #fork this repo - repo2 = fixture.create_fork('repo1', 'repo1-fork') + repo2 = fixture.create_fork(u'repo1', u'repo1-fork') self.r2_id = repo2.repo_id #now make cs3-6 cs2 = fixture.commit_change(repo1.repo_name, filename='file1', @@ -445,7 +445,7 @@ def test_org_repo_new_commits_after_forking_simple_diff_hg(self): self.log_user() - repo1 = fixture.create_repo('one', repo_type='hg', + repo1 = fixture.create_repo(u'one', repo_type='hg', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN) @@ -457,7 +457,7 @@ Session().commit() self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id]) #fork the repo1 - repo2 = fixture.create_repo('one-fork', repo_type='hg', + repo2 = fixture.create_repo(u'one-fork', repo_type='hg', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN, clone_uri=repo1.repo_full_path, @@ -524,7 +524,7 @@ def test_org_repo_new_commits_after_forking_simple_diff_git(self): self.log_user() - repo1 = fixture.create_repo('one-git', repo_type='git', + repo1 = fixture.create_repo(u'one-git', repo_type='git', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN) @@ -537,7 +537,7 @@ Session().commit() self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id]) #fork the repo1 - repo2 = fixture.create_repo('one-git-fork', repo_type='git', + repo2 = fixture.create_repo(u'one-git-fork', repo_type='git', repo_description='diff-test', cur_user=TEST_USER_ADMIN_LOGIN, clone_uri=repo1.repo_full_path,
--- a/kallithea/tests/functional/test_files.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_files.py Tue Jan 05 16:30:12 2016 +0100 @@ -374,7 +374,7 @@ ]) def test_add_file_into_hg(self, cnt, location, filename): self.log_user() - repo = fixture.create_repo('commit-test-%s' % cnt, repo_type='hg') + repo = fixture.create_repo(u'commit-test-%s' % cnt, repo_type='hg') response = self.app.post(url('files_add_home', repo_name=repo.repo_name, revision='tip', f_path='/'), @@ -450,7 +450,7 @@ ]) def test_add_file_into_git(self, cnt, location, filename): self.log_user() - repo = fixture.create_repo('commit-test-%s' % cnt, repo_type='git') + repo = fixture.create_repo(u'commit-test-%s' % cnt, repo_type='git') response = self.app.post(url('files_add_home', repo_name=repo.repo_name, revision='tip', f_path='/'), @@ -476,7 +476,7 @@ def test_edit_file_view_not_on_branch_hg(self): self.log_user() - repo = fixture.create_repo('test-edit-repo', repo_type='hg') + repo = fixture.create_repo(u'test-edit-repo', repo_type='hg') ## add file location = 'vcs' @@ -506,7 +506,7 @@ def test_edit_file_view_commit_changes_hg(self): self.log_user() - repo = fixture.create_repo('test-edit-repo', repo_type='hg') + repo = fixture.create_repo(u'test-edit-repo', repo_type='hg') ## add file location = 'vcs' @@ -550,7 +550,7 @@ def test_edit_file_view_not_on_branch_git(self): self.log_user() - repo = fixture.create_repo('test-edit-repo', repo_type='git') + repo = fixture.create_repo(u'test-edit-repo', repo_type='git') ## add file location = 'vcs' @@ -580,7 +580,7 @@ def test_edit_file_view_commit_changes_git(self): self.log_user() - repo = fixture.create_repo('test-edit-repo', repo_type='git') + repo = fixture.create_repo(u'test-edit-repo', repo_type='git') ## add file location = 'vcs' @@ -624,7 +624,7 @@ def test_delete_file_view_not_on_branch_hg(self): self.log_user() - repo = fixture.create_repo('test-delete-repo', repo_type='hg') + repo = fixture.create_repo(u'test-delete-repo', repo_type='hg') ## add file location = 'vcs' @@ -654,7 +654,7 @@ def test_delete_file_view_commit_changes_hg(self): self.log_user() - repo = fixture.create_repo('test-delete-repo', repo_type='hg') + repo = fixture.create_repo(u'test-delete-repo', repo_type='hg') ## add file location = 'vcs' @@ -697,7 +697,7 @@ def test_delete_file_view_not_on_branch_git(self): self.log_user() - repo = fixture.create_repo('test-delete-repo', repo_type='git') + repo = fixture.create_repo(u'test-delete-repo', repo_type='git') ## add file location = 'vcs' @@ -727,7 +727,7 @@ def test_delete_file_view_commit_changes_git(self): self.log_user() - repo = fixture.create_repo('test-delete-repo', repo_type='git') + repo = fixture.create_repo(u'test-delete-repo', repo_type='git') ## add file location = 'vcs'
--- a/kallithea/tests/functional/test_forks.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_forks.py Tue Jan 05 16:30:12 2016 +0100 @@ -101,7 +101,7 @@ def test_fork_create_into_group(self): self.log_user() - group = fixture.create_repo_group('vc') + group = fixture.create_repo_group(u'vc') group_id = group.group_id fork_name = self.REPO_FORK fork_name_full = 'vc/%s' % fork_name
--- a/kallithea/tests/functional/test_home.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_home.py Tue Jan 05 16:30:12 2016 +0100 @@ -44,13 +44,13 @@ def test_index_page_on_groups(self): self.log_user() - gr = fixture.create_repo_group('gr1') - fixture.create_repo(name='gr1/repo_in_group', repo_group=gr) - response = self.app.get(url('repos_group_home', group_name='gr1')) + gr = fixture.create_repo_group(u'gr1') + fixture.create_repo(name=u'gr1/repo_in_group', repo_group=gr) + response = self.app.get(url('repos_group_home', group_name=u'gr1')) try: - response.mustcontain("gr1/repo_in_group") + response.mustcontain(u"gr1/repo_in_group") finally: - RepoModel().delete('gr1/repo_in_group') - RepoGroupModel().delete(repo_group='gr1', force_delete=True) + RepoModel().delete(u'gr1/repo_in_group') + RepoGroupModel().delete(repo_group=u'gr1', force_delete=True) Session().commit()
--- a/kallithea/tests/functional/test_login.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_login.py Tue Jan 05 16:30:12 2016 +0100 @@ -350,8 +350,8 @@ username = 'test_password_reset_1' password = 'qweqwe' email = 'username@example.com' - name = 'passwd' - lastname = 'reset' + name = u'passwd' + lastname = u'reset' timestamp = int(time.time()) new = User()
--- a/kallithea/tests/functional/test_my_account.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_my_account.py Tue Jan 05 16:30:12 2016 +0100 @@ -156,8 +156,8 @@ username=TEST_USER_ADMIN_LOGIN, new_password=TEST_USER_ADMIN_PASS, password_confirmation='test122', - firstname='NewName', - lastname='NewLastname', + firstname=u'NewName', + lastname=u'NewLastname', email=new_email, _authentication_token=self.authentication_token()) ) @@ -173,8 +173,8 @@ username=TEST_USER_ADMIN_LOGIN, new_password=TEST_USER_ADMIN_PASS, password_confirmation='test122', - firstname='NewName', - lastname='NewLastname', + firstname=u'NewName', + lastname=u'NewLastname', email=new_email, _authentication_token=self.authentication_token()))
--- a/kallithea/tests/functional/test_pullrequests.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_pullrequests.py Tue Jan 05 16:30:12 2016 +0100 @@ -146,13 +146,13 @@ class TestPullrequestsGetRepoRefs(TestController): def setUp(self): - self.main = fixture.create_repo('main', repo_type='hg') + self.main = fixture.create_repo(u'main', repo_type='hg') Session.add(self.main) Session.commit() self.c = PullrequestsController() def tearDown(self): - fixture.destroy_repo('main') + fixture.destroy_repo(u'main') Session.commit() Session.remove()
--- a/kallithea/tests/functional/test_summary.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/functional/test_summary.py Tue Jan 05 16:30:12 2016 +0100 @@ -82,7 +82,7 @@ def test_index_by_repo_having_id_path_in_name_hg(self): self.log_user() - fixture.create_repo(name='repo_1') + fixture.create_repo(name=u'repo_1') response = self.app.get(url(controller='summary', action='index', repo_name='repo_1')) @@ -90,7 +90,7 @@ try: response.mustcontain("repo_1") finally: - RepoModel().delete(Repository.get_by_repo_name('repo_1')) + RepoModel().delete(Repository.get_by_repo_name(u'repo_1')) Session().commit() def test_index_by_id_git(self):
--- a/kallithea/tests/models/common.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/models/common.py Tue Jan 05 16:30:12 2016 +0100 @@ -15,7 +15,7 @@ def _destroy_project_tree(test_u1_id): Session.remove() - repo_group = RepoGroup.get_by_group_name(group_name='g0') + repo_group = RepoGroup.get_by_group_name(group_name=u'g0') for el in reversed(repo_group.recursive_groups_and_repos()): if isinstance(el, Repository): RepoModel().delete(el) @@ -56,18 +56,18 @@ username=u'test_u1', password=u'qweqwe', email=u'test_u1@example.com', firstname=u'test_u1', lastname=u'test_u1' ) - g0 = fixture.create_repo_group('g0') - g0_1 = fixture.create_repo_group('g0_1', group_parent_id=g0) - g0_1_1 = fixture.create_repo_group('g0_1_1', group_parent_id=g0_1) - g0_1_1_r1 = fixture.create_repo('g0/g0_1/g0_1_1/g0_1_1_r1', repo_group=g0_1_1) - g0_1_1_r2 = fixture.create_repo('g0/g0_1/g0_1_1/g0_1_1_r2', repo_group=g0_1_1) - g0_1_r1 = fixture.create_repo('g0/g0_1/g0_1_r1', repo_group=g0_1) - g0_2 = fixture.create_repo_group('g0_2', group_parent_id=g0) - g0_2_r1 = fixture.create_repo('g0/g0_2/g0_2_r1', repo_group=g0_2) - g0_2_r2 = fixture.create_repo('g0/g0_2/g0_2_r2', repo_group=g0_2) - g0_3 = fixture.create_repo_group('g0_3', group_parent_id=g0) - g0_3_r1 = fixture.create_repo('g0/g0_3/g0_3_r1', repo_group=g0_3) - g0_3_r2_private = fixture.create_repo('g0/g0_3/g0_3_r1_private', + g0 = fixture.create_repo_group(u'g0') + g0_1 = fixture.create_repo_group(u'g0_1', group_parent_id=g0) + g0_1_1 = fixture.create_repo_group(u'g0_1_1', group_parent_id=g0_1) + g0_1_1_r1 = fixture.create_repo(u'g0/g0_1/g0_1_1/g0_1_1_r1', repo_group=g0_1_1) + g0_1_1_r2 = fixture.create_repo(u'g0/g0_1/g0_1_1/g0_1_1_r2', repo_group=g0_1_1) + g0_1_r1 = fixture.create_repo(u'g0/g0_1/g0_1_r1', repo_group=g0_1) + g0_2 = fixture.create_repo_group(u'g0_2', group_parent_id=g0) + g0_2_r1 = fixture.create_repo(u'g0/g0_2/g0_2_r1', repo_group=g0_2) + g0_2_r2 = fixture.create_repo(u'g0/g0_2/g0_2_r2', repo_group=g0_2) + g0_3 = fixture.create_repo_group(u'g0_3', group_parent_id=g0) + g0_3_r1 = fixture.create_repo(u'g0/g0_3/g0_3_r1', repo_group=g0_3) + g0_3_r2_private = fixture.create_repo(u'g0/g0_3/g0_3_r1_private', repo_group=g0_3, repo_private=True) return test_u1
--- 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 @@ -105,8 +105,8 @@ perms['repositories'][HG_REPO]) def test_default_group_perms(self): - self.g1 = fixture.create_repo_group('test1', skip_if_exists=True) - self.g2 = fixture.create_repo_group('test2', skip_if_exists=True) + self.g1 = fixture.create_repo_group(u'test1', skip_if_exists=True) + self.g2 = fixture.create_repo_group(u'test2', skip_if_exists=True) u1_auth = AuthUser(user_id=self.u1.user_id) perms = { 'repositories_groups': {u'test1': 'group.read', u'test2': 'group.read'}, @@ -121,8 +121,8 @@ perms['global']) def test_default_admin_group_perms(self): - self.g1 = fixture.create_repo_group('test1', skip_if_exists=True) - self.g2 = fixture.create_repo_group('test2', skip_if_exists=True) + self.g1 = fixture.create_repo_group(u'test1', skip_if_exists=True) + self.g2 = fixture.create_repo_group(u'test2', skip_if_exists=True) a1_auth = AuthUser(user_id=self.a1.user_id) perms = { 'repositories_groups': {u'test1': 'group.admin', u'test2': 'group.admin'}, @@ -137,7 +137,7 @@ def test_propagated_permission_from_users_group_by_explicit_perms_exist(self): # make group - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') UserGroupModel().add_user_to_group(self.ug1, self.u1) # set permission to lower @@ -169,7 +169,7 @@ def test_propagated_permission_from_users_group(self): # make group - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') UserGroupModel().add_user_to_group(self.ug1, self.u3) # grant perm for group this should override default permission from user @@ -192,7 +192,7 @@ def test_propagated_permission_from_users_group_lower_weight(self): # make group - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') # add user to group UserGroupModel().add_user_to_group(self.ug1, self.u1) @@ -225,8 +225,8 @@ perms['repositories_groups']) def test_repo_in_group_permissions(self): - self.g1 = fixture.create_repo_group('group1', skip_if_exists=True) - self.g2 = fixture.create_repo_group('group2', skip_if_exists=True) + self.g1 = fixture.create_repo_group(u'group1', skip_if_exists=True) + self.g2 = fixture.create_repo_group(u'group2', skip_if_exists=True) # both perms should be read ! u1_auth = AuthUser(user_id=self.u1.user_id) self.assertEqual(u1_auth.permissions['repositories_groups'], @@ -289,7 +289,7 @@ def test_repo_group_user_as_user_group_member(self): # create Group1 - self.g1 = fixture.create_repo_group('group1', skip_if_exists=True) + self.g1 = fixture.create_repo_group(u'group1', skip_if_exists=True) a1_auth = AuthUser(user_id=self.anon.user_id) self.assertEqual(a1_auth.permissions['repositories_groups'], @@ -300,7 +300,7 @@ user=self.anon, perm='group.none') # make group - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') # add user to group UserGroupModel().add_user_to_group(self.ug1, self.u1) Session().commit() @@ -441,7 +441,7 @@ # Add user to inactive user group, set specific permissions on user # group and disable inherit-from-default. User permissions should still # inherit from default. - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') self.ug1.inherit_default_permissions = False user_group_model = UserGroupModel() user_group_model.add_user_to_group(self.ug1, self.u1) @@ -477,7 +477,7 @@ # Add user to inactive user group, set specific permissions on user # group and disable inherit-from-default. User permissions should still # inherit from default. - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') self.ug1.inherit_default_permissions = False user_group_model = UserGroupModel() user_group_model.add_user_to_group(self.ug1, self.u1) @@ -509,7 +509,7 @@ 'hg.create.write_on_repogroup.true'])) def test_inactive_user_group_does_not_affect_repo_permissions(self): - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') self.ug1.inherit_default_permissions = False user_group_model = UserGroupModel() user_group_model.add_user_to_group(self.ug1, self.u1) @@ -517,7 +517,7 @@ # note: make u2 repo owner rather than u1, because the owner always has # admin permissions - self.test_repo = fixture.create_repo(name='myownrepo', + self.test_repo = fixture.create_repo(name=u'myownrepo', repo_type='hg', cur_user=self.u2) @@ -535,7 +535,7 @@ 'repository.write') def test_inactive_user_group_does_not_affect_repo_permissions_inverse(self): - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') self.ug1.inherit_default_permissions = False user_group_model = UserGroupModel() user_group_model.add_user_to_group(self.ug1, self.u1) @@ -543,7 +543,7 @@ # note: make u2 repo owner rather than u1, because the owner always has # admin permissions - self.test_repo = fixture.create_repo(name='myownrepo', + self.test_repo = fixture.create_repo(name=u'myownrepo', repo_type='hg', cur_user=self.u2) @@ -561,13 +561,13 @@ 'repository.admin') def test_inactive_user_group_does_not_affect_repo_group_permissions(self): - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') self.ug1.inherit_default_permissions = False user_group_model = UserGroupModel() user_group_model.add_user_to_group(self.ug1, self.u1) user_group_model.update(self.ug1, {'users_group_active': False}) - self.g1 = fixture.create_repo_group('group1', skip_if_exists=True) + self.g1 = fixture.create_repo_group(u'group1', skip_if_exists=True) # enable admin access for user group on repo group RepoGroupModel().grant_user_group_permission(self.g1, @@ -583,13 +583,13 @@ {u'group1': u'group.write'}) def test_inactive_user_group_does_not_affect_repo_group_permissions_inverse(self): - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') self.ug1.inherit_default_permissions = False user_group_model = UserGroupModel() user_group_model.add_user_to_group(self.ug1, self.u1) user_group_model.update(self.ug1, {'users_group_active': False}) - self.g1 = fixture.create_repo_group('group1', skip_if_exists=True) + self.g1 = fixture.create_repo_group(u'group1', skip_if_exists=True) # enable only write access for user group on repo group RepoGroupModel().grant_user_group_permission(self.g1, @@ -605,13 +605,13 @@ {u'group1': u'group.admin'}) def test_inactive_user_group_does_not_affect_user_group_permissions(self): - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') self.ug1.inherit_default_permissions = False user_group_model = UserGroupModel() user_group_model.add_user_to_group(self.ug1, self.u1) user_group_model.update(self.ug1, {'users_group_active': False}) - self.ug2 = fixture.create_user_group('G2') + self.ug2 = fixture.create_user_group(u'G2') # enable admin access for user group on user group UserGroupModel().grant_user_group_permission(self.ug2, @@ -627,13 +627,13 @@ self.assertEqual(u1_auth.permissions['user_groups'][u'G2'], u'usergroup.write') def test_inactive_user_group_does_not_affect_user_group_permissions_inverse(self): - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') self.ug1.inherit_default_permissions = False user_group_model = UserGroupModel() user_group_model.add_user_to_group(self.ug1, self.u1) user_group_model.update(self.ug1, {'users_group_active': False}) - self.ug2 = fixture.create_user_group('G2') + self.ug2 = fixture.create_user_group(u'G2') # enable only write access for user group on user group UserGroupModel().grant_user_group_permission(self.ug2, @@ -650,7 +650,7 @@ def test_owner_permissions_doesnot_get_overwritten_by_group(self): #create repo as USER, - self.test_repo = fixture.create_repo(name='myownrepo', + self.test_repo = fixture.create_repo(name=u'myownrepo', repo_type='hg', cur_user=self.u1) @@ -659,7 +659,7 @@ self.assertEqual(u1_auth.permissions['repositories']['myownrepo'], 'repository.admin') #set his permission as user group, he should still be admin - self.ug1 = fixture.create_user_group('G1') + self.ug1 = fixture.create_user_group(u'G1') UserGroupModel().add_user_to_group(self.ug1, self.u1) RepoModel().grant_user_group_permission(self.test_repo, group_name=self.ug1, @@ -672,7 +672,7 @@ def test_owner_permissions_doesnot_get_overwritten_by_others(self): #create repo as USER, - self.test_repo = fixture.create_repo(name='myownrepo', + self.test_repo = fixture.create_repo(name=u'myownrepo', repo_type='hg', cur_user=self.u1)
--- a/kallithea/tests/models/test_repo_groups.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/models/test_repo_groups.py Tue Jan 05 16:30:12 2016 +0100 @@ -13,7 +13,7 @@ fixture = Fixture() -def _update_group(id_, group_name, desc='desc', parent_id=None): +def _update_group(id_, group_name, desc=u'desc', parent_id=None): form_data = fixture._get_group_create_params(group_name=group_name, group_desc=desc, group_parent_id=parent_id) @@ -36,9 +36,9 @@ class TestRepoGroups(BaseTestCase): def setUp(self): - self.g1 = fixture.create_repo_group('test1', skip_if_exists=True) - self.g2 = fixture.create_repo_group('test2', skip_if_exists=True) - self.g3 = fixture.create_repo_group('test3', skip_if_exists=True) + self.g1 = fixture.create_repo_group(u'test1', skip_if_exists=True) + self.g2 = fixture.create_repo_group(u'test2', skip_if_exists=True) + self.g3 = fixture.create_repo_group(u'test3', skip_if_exists=True) def tearDown(self): Session.remove() @@ -58,78 +58,78 @@ RepoGroupModel().delete(id_) def test_create_group(self): - g = fixture.create_repo_group('newGroup') + g = fixture.create_repo_group(u'newGroup') Session().commit() self.assertEqual(g.full_path, 'newGroup') self.assertTrue(self.__check_path('newGroup')) def test_create_same_name_group(self): - self.assertRaises(IntegrityError, lambda: fixture.create_repo_group('newGroup')) + self.assertRaises(IntegrityError, lambda: fixture.create_repo_group(u'newGroup')) Session().rollback() def test_same_subgroup(self): - sg1 = fixture.create_repo_group('sub1', group_parent_id=self.g1.group_id) + sg1 = fixture.create_repo_group(u'sub1', group_parent_id=self.g1.group_id) self.assertEqual(sg1.parent_group, self.g1) self.assertEqual(sg1.full_path, 'test1/sub1') self.assertTrue(self.__check_path('test1', 'sub1')) - ssg1 = fixture.create_repo_group('subsub1', group_parent_id=sg1.group_id) + ssg1 = fixture.create_repo_group(u'subsub1', group_parent_id=sg1.group_id) self.assertEqual(ssg1.parent_group, sg1) self.assertEqual(ssg1.full_path, 'test1/sub1/subsub1') self.assertTrue(self.__check_path('test1', 'sub1', 'subsub1')) def test_remove_group(self): - sg1 = fixture.create_repo_group('deleteme') + sg1 = fixture.create_repo_group(u'deleteme') self.__delete_group(sg1.group_id) self.assertEqual(RepoGroup.get(sg1.group_id), None) self.assertFalse(self.__check_path('deteteme')) - sg1 = fixture.create_repo_group('deleteme', group_parent_id=self.g1.group_id) + sg1 = fixture.create_repo_group(u'deleteme', group_parent_id=self.g1.group_id) self.__delete_group(sg1.group_id) self.assertEqual(RepoGroup.get(sg1.group_id), None) self.assertFalse(self.__check_path('test1', 'deteteme')) def test_rename_single_group(self): - sg1 = fixture.create_repo_group('initial') + sg1 = fixture.create_repo_group(u'initial') - new_sg1 = _update_group(sg1.group_id, 'after') + new_sg1 = _update_group(sg1.group_id, u'after') self.assertTrue(self.__check_path('after')) - self.assertEqual(RepoGroup.get_by_group_name('initial'), None) + self.assertEqual(RepoGroup.get_by_group_name(u'initial'), None) def test_update_group_parent(self): - sg1 = fixture.create_repo_group('initial', group_parent_id=self.g1.group_id) + sg1 = fixture.create_repo_group(u'initial', group_parent_id=self.g1.group_id) - new_sg1 = _update_group(sg1.group_id, 'after', parent_id=self.g1.group_id) + new_sg1 = _update_group(sg1.group_id, u'after', parent_id=self.g1.group_id) self.assertTrue(self.__check_path('test1', 'after')) - self.assertEqual(RepoGroup.get_by_group_name('test1/initial'), None) + self.assertEqual(RepoGroup.get_by_group_name(u'test1/initial'), None) - new_sg1 = _update_group(sg1.group_id, 'after', parent_id=self.g3.group_id) + new_sg1 = _update_group(sg1.group_id, u'after', parent_id=self.g3.group_id) self.assertTrue(self.__check_path('test3', 'after')) - self.assertEqual(RepoGroup.get_by_group_name('test3/initial'), None) + self.assertEqual(RepoGroup.get_by_group_name(u'test3/initial'), None) - new_sg1 = _update_group(sg1.group_id, 'hello') + new_sg1 = _update_group(sg1.group_id, u'hello') self.assertTrue(self.__check_path('hello')) - self.assertEqual(RepoGroup.get_by_group_name('hello'), new_sg1) + self.assertEqual(RepoGroup.get_by_group_name(u'hello'), new_sg1) def test_subgrouping_with_repo(self): - g1 = fixture.create_repo_group('g1') - g2 = fixture.create_repo_group('g2') + g1 = fixture.create_repo_group(u'g1') + g2 = fixture.create_repo_group(u'g2') # create new repo - r = fixture.create_repo('john') + r = fixture.create_repo(u'john') self.assertEqual(r.repo_name, 'john') # put repo into group - r = _update_repo('john', repo_group=g1.group_id) + r = _update_repo(u'john', repo_group=g1.group_id) Session().commit() self.assertEqual(r.repo_name, 'g1/john') - _update_group(g1.group_id, 'g1', parent_id=g2.group_id) + _update_group(g1.group_id, u'g1', parent_id=g2.group_id) self.assertTrue(self.__check_path('g2', 'g1')) # test repo @@ -137,13 +137,13 @@ r.just_name])) def test_move_to_root(self): - g1 = fixture.create_repo_group('t11') - g2 = fixture.create_repo_group('t22', group_parent_id=g1.group_id) + g1 = fixture.create_repo_group(u't11') + g2 = fixture.create_repo_group(u't22', group_parent_id=g1.group_id) self.assertEqual(g2.full_path, 't11/t22') self.assertTrue(self.__check_path('t11', 't22')) - g2 = _update_group(g2.group_id, 'g22', parent_id=None) + g2 = _update_group(g2.group_id, u'g22', parent_id=None) Session().commit() self.assertEqual(g2.group_name, 'g22') @@ -153,14 +153,14 @@ self.assertTrue(self.__check_path('g22')) def test_rename_top_level_group_in_nested_setup(self): - g1 = fixture.create_repo_group('L1') - g2 = fixture.create_repo_group('L2', group_parent_id=g1.group_id) - g3 = fixture.create_repo_group('L3', group_parent_id=g2.group_id) + g1 = fixture.create_repo_group(u'L1') + g2 = fixture.create_repo_group(u'L2', group_parent_id=g1.group_id) + g3 = fixture.create_repo_group(u'L3', group_parent_id=g2.group_id) - r = fixture.create_repo('L1/L2/L3/L3_REPO', repo_group=g3.group_id) + r = fixture.create_repo(u'L1/L2/L3/L3_REPO', repo_group=g3.group_id) ##rename L1 all groups should be now changed - _update_group(g1.group_id, 'L1_NEW') + _update_group(g1.group_id, u'L1_NEW') Session().commit() self.assertEqual(g1.full_path, 'L1_NEW') self.assertEqual(g2.full_path, 'L1_NEW/L2') @@ -168,14 +168,14 @@ self.assertEqual(r.repo_name, 'L1_NEW/L2/L3/L3_REPO') def test_change_parent_of_top_level_group_in_nested_setup(self): - g1 = fixture.create_repo_group('R1') - g2 = fixture.create_repo_group('R2', group_parent_id=g1.group_id) - g3 = fixture.create_repo_group('R3', group_parent_id=g2.group_id) - g4 = fixture.create_repo_group('R1_NEW') + g1 = fixture.create_repo_group(u'R1') + g2 = fixture.create_repo_group(u'R2', group_parent_id=g1.group_id) + g3 = fixture.create_repo_group(u'R3', group_parent_id=g2.group_id) + g4 = fixture.create_repo_group(u'R1_NEW') - r = fixture.create_repo('R1/R2/R3/R3_REPO', repo_group=g3.group_id) + r = fixture.create_repo(u'R1/R2/R3/R3_REPO', repo_group=g3.group_id) ##rename L1 all groups should be now changed - _update_group(g1.group_id, 'R1', parent_id=g4.group_id) + _update_group(g1.group_id, u'R1', parent_id=g4.group_id) Session().commit() self.assertEqual(g1.full_path, 'R1_NEW/R1') self.assertEqual(g2.full_path, 'R1_NEW/R1/R2') @@ -183,15 +183,15 @@ self.assertEqual(r.repo_name, 'R1_NEW/R1/R2/R3/R3_REPO') def test_change_parent_of_top_level_group_in_nested_setup_with_rename(self): - g1 = fixture.create_repo_group('X1') - g2 = fixture.create_repo_group('X2', group_parent_id=g1.group_id) - g3 = fixture.create_repo_group('X3', group_parent_id=g2.group_id) - g4 = fixture.create_repo_group('X1_NEW') + g1 = fixture.create_repo_group(u'X1') + g2 = fixture.create_repo_group(u'X2', group_parent_id=g1.group_id) + g3 = fixture.create_repo_group(u'X3', group_parent_id=g2.group_id) + g4 = fixture.create_repo_group(u'X1_NEW') - r = fixture.create_repo('X1/X2/X3/X3_REPO', repo_group=g3.group_id) + r = fixture.create_repo(u'X1/X2/X3/X3_REPO', repo_group=g3.group_id) ##rename L1 all groups should be now changed - _update_group(g1.group_id, 'X1_PRIM', parent_id=g4.group_id) + _update_group(g1.group_id, u'X1_PRIM', parent_id=g4.group_id) Session().commit() self.assertEqual(g1.full_path, 'X1_NEW/X1_PRIM') self.assertEqual(g2.full_path, 'X1_NEW/X1_PRIM/X2')
--- a/kallithea/tests/models/test_repos.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/models/test_repos.py Tue Jan 05 16:30:12 2016 +0100 @@ -18,60 +18,60 @@ Session.remove() def test_remove_repo(self): - repo = fixture.create_repo(name='test-repo-1') + repo = fixture.create_repo(name=u'test-repo-1') Session().commit() RepoModel().delete(repo=repo) Session().commit() - self.assertEqual(None, Repository.get_by_repo_name(repo_name='test-repo-1')) + self.assertEqual(None, Repository.get_by_repo_name(repo_name=u'test-repo-1')) def test_remove_repo_repo_raises_exc_when_attached_forks(self): - repo = fixture.create_repo(name='test-repo-1') + repo = fixture.create_repo(name=u'test-repo-1') Session().commit() - fixture.create_fork(repo.repo_name, 'test-repo-fork-1') + fixture.create_fork(repo.repo_name, u'test-repo-fork-1') Session().commit() self.assertRaises(AttachedForksError, lambda: RepoModel().delete(repo=repo)) def test_remove_repo_delete_forks(self): - repo = fixture.create_repo(name='test-repo-1') + repo = fixture.create_repo(name=u'test-repo-1') Session().commit() - fork = fixture.create_fork(repo.repo_name, 'test-repo-fork-1') + fork = fixture.create_fork(repo.repo_name, u'test-repo-fork-1') Session().commit() #fork of fork - fixture.create_fork(fork.repo_name, 'test-repo-fork-fork-1') + fixture.create_fork(fork.repo_name, u'test-repo-fork-fork-1') Session().commit() RepoModel().delete(repo=repo, forks='delete') Session().commit() - self.assertEqual(None, Repository.get_by_repo_name(repo_name='test-repo-1')) - self.assertEqual(None, Repository.get_by_repo_name(repo_name='test-repo-fork-1')) - self.assertEqual(None, Repository.get_by_repo_name(repo_name='test-repo-fork-fork-1')) + self.assertEqual(None, Repository.get_by_repo_name(repo_name=u'test-repo-1')) + self.assertEqual(None, Repository.get_by_repo_name(repo_name=u'test-repo-fork-1')) + self.assertEqual(None, Repository.get_by_repo_name(repo_name=u'test-repo-fork-fork-1')) def test_remove_repo_detach_forks(self): - repo = fixture.create_repo(name='test-repo-1') + repo = fixture.create_repo(name=u'test-repo-1') Session().commit() - fork = fixture.create_fork(repo.repo_name, 'test-repo-fork-1') + fork = fixture.create_fork(repo.repo_name, u'test-repo-fork-1') Session().commit() #fork of fork - fixture.create_fork(fork.repo_name, 'test-repo-fork-fork-1') + fixture.create_fork(fork.repo_name, u'test-repo-fork-fork-1') Session().commit() RepoModel().delete(repo=repo, forks='detach') Session().commit() try: - self.assertEqual(None, Repository.get_by_repo_name(repo_name='test-repo-1')) - self.assertNotEqual(None, Repository.get_by_repo_name(repo_name='test-repo-fork-1')) - self.assertNotEqual(None, Repository.get_by_repo_name(repo_name='test-repo-fork-fork-1')) + self.assertEqual(None, Repository.get_by_repo_name(repo_name=u'test-repo-1')) + self.assertNotEqual(None, Repository.get_by_repo_name(repo_name=u'test-repo-fork-1')) + self.assertNotEqual(None, Repository.get_by_repo_name(repo_name=u'test-repo-fork-fork-1')) finally: - RepoModel().delete(repo='test-repo-fork-fork-1') - RepoModel().delete(repo='test-repo-fork-1') + RepoModel().delete(repo=u'test-repo-fork-fork-1') + RepoModel().delete(repo=u'test-repo-fork-1') Session().commit()
--- a/kallithea/tests/models/test_user_group_permissions_on_repo_groups.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/models/test_user_group_permissions_on_repo_groups.py Tue Jan 05 16:30:12 2016 +0100 @@ -17,7 +17,7 @@ _get_group_perms = None -def permissions_setup_func(group_name='g0', perm='group.read', recursive='all'): +def permissions_setup_func(group_name=u'g0', perm='group.read', recursive='all'): """ Resets all permissions to perm attribute """ @@ -44,7 +44,7 @@ Session().commit() test_u2_id = test_u2.user_id - gr1 = fixture.create_user_group('perms_group_1') + gr1 = fixture.create_user_group(u'perms_group_1') Session().commit() test_u2_gr_id = gr1.users_group_id UserGroupModel().add_user_to_group(gr1, user=test_u2_id) @@ -58,13 +58,13 @@ def teardown_module(): _destroy_project_tree(test_u2_id) - fixture.destroy_user_group('perms_group_1') + fixture.destroy_user_group(u'perms_group_1') def test_user_permissions_on_group_without_recursive_mode(): # set permission to g0 non-recursive mode recursive = 'none' - group = 'g0' + group = u'g0' permissions_setup_func(group, 'group.write', recursive=recursive) items = [x for x in _get_repo_perms(group, recursive)] @@ -83,7 +83,7 @@ def test_user_permissions_on_group_without_recursive_mode_subgroup(): # set permission to g0 non-recursive mode recursive = 'none' - group = 'g0/g0_1' + group = u'g0/g0_1' permissions_setup_func(group, 'group.write', recursive=recursive) items = [x for x in _get_repo_perms(group, recursive)] @@ -104,7 +104,7 @@ # set permission to g0 recursive mode, all children including # other repos and groups should have this permission now set ! recursive = 'all' - group = 'g0' + group = u'g0' permissions_setup_func(group, 'group.write', recursive=recursive) repo_items = [x for x in _get_repo_perms(group, recursive)] @@ -121,7 +121,7 @@ def test_user_permissions_on_group_with_recursive_mode_inner_group(): ## set permission to g0_3 group to none recursive = 'all' - group = 'g0/g0_3' + group = u'g0/g0_3' permissions_setup_func(group, 'group.none', recursive=recursive) repo_items = [x for x in _get_repo_perms(group, recursive)] @@ -138,7 +138,7 @@ def test_user_permissions_on_group_with_recursive_mode_deepest(): ## set permission to g0_3 group to none recursive = 'all' - group = 'g0/g0_1/g0_1_1' + group = u'g0/g0_1/g0_1_1' permissions_setup_func(group, 'group.write', recursive=recursive) repo_items = [x for x in _get_repo_perms(group, recursive)] @@ -155,7 +155,7 @@ def test_user_permissions_on_group_with_recursive_mode_only_with_repos(): ## set permission to g0_3 group to none recursive = 'all' - group = 'g0/g0_2' + group = u'g0/g0_2' permissions_setup_func(group, 'group.admin', recursive=recursive) repo_items = [x for x in _get_repo_perms(group, recursive)] @@ -172,7 +172,7 @@ def test_user_permissions_on_group_with_recursive_mode_on_repos(): # set permission to g0/g0_1 with recursive mode on just repositories recursive = 'repos' - group = 'g0/g0_1' + group = u'g0/g0_1' perm = 'group.write' permissions_setup_func(group, perm, recursive=recursive) @@ -196,7 +196,7 @@ def test_user_permissions_on_group_with_recursive_mode_on_repo_groups(): # set permission to g0/g0_1 with recursive mode on just repository groups recursive = 'groups' - group = 'g0/g0_1' + group = u'g0/g0_1' perm = 'group.none' permissions_setup_func(group, perm, recursive=recursive)
--- a/kallithea/tests/models/test_user_groups.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/models/test_user_groups.py Tue Jan 05 16:30:12 2016 +0100 @@ -20,12 +20,12 @@ @parameterized.expand([ ([], [], [], [], []), - ([], ['regular'], [], [], ['regular']), # no changes of regular - (['some_other'], [], [], ['some_other'], []), # not added to regular group - ([], ['regular'], ['container'], ['container'], ['regular', 'container']), - ([], ['regular'], [], ['container', 'container2'], ['regular', 'container', 'container2']), - ([], ['regular'], ['other'], [], ['regular']), # remove not used - (['some_other'], ['regular'], ['other', 'container'], ['container', 'container2'], ['regular', 'container', 'container2']), + ([], [u'regular'], [], [], [u'regular']), # no changes of regular + ([u'some_other'], [], [], [u'some_other'], []), # not added to regular group + ([], [u'regular'], [u'container'], [u'container'], [u'regular', u'container']), + ([], [u'regular'], [], [u'container', u'container2'], [u'regular', u'container', u'container2']), + ([], [u'regular'], [u'other'], [], [u'regular']), # remove not used + ([u'some_other'], [u'regular'], [u'other', u'container'], [u'container', u'container2'], [u'regular', u'container', u'container2']), ]) def test_enforce_groups(self, pre_existing, regular_should_be, external_should_be, groups, expected):
--- a/kallithea/tests/models/test_user_permissions_on_repo_groups.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/models/test_user_permissions_on_repo_groups.py Tue Jan 05 16:30:12 2016 +0100 @@ -13,7 +13,7 @@ _get_group_perms = None -def permissions_setup_func(group_name='g0', perm='group.read', recursive='all', +def permissions_setup_func(group_name=u'g0', perm='group.read', recursive='all', user_id=None): """ Resets all permissions to perm attribute @@ -58,7 +58,7 @@ def test_user_permissions_on_group_without_recursive_mode(): # set permission to g0 non-recursive mode recursive = 'none' - group = 'g0' + group = u'g0' permissions_setup_func(group, 'group.write', recursive=recursive) items = [x for x in _get_repo_perms(group, recursive)] @@ -77,7 +77,7 @@ def test_user_permissions_on_group_without_recursive_mode_subgroup(): # set permission to g0 non-recursive mode recursive = 'none' - group = 'g0/g0_1' + group = u'g0/g0_1' permissions_setup_func(group, 'group.write', recursive=recursive) items = [x for x in _get_repo_perms(group, recursive)] @@ -98,7 +98,7 @@ # set permission to g0 recursive mode, all children including # other repos and groups should have this permission now set ! recursive = 'all' - group = 'g0' + group = u'g0' permissions_setup_func(group, 'group.write', recursive=recursive) repo_items = [x for x in _get_repo_perms(group, recursive)] @@ -117,7 +117,7 @@ # set permission to g0 recursive mode, all children including # other repos and groups should have this permission now set ! recursive = 'all' - group = 'g0' + group = u'g0' default_user_id = User.get_default_user().user_id permissions_setup_func(group, 'group.write', recursive=recursive, user_id=default_user_id) @@ -142,7 +142,7 @@ def test_user_permissions_on_group_with_recursive_mode_inner_group(): ## set permission to g0_3 group to none recursive = 'all' - group = 'g0/g0_3' + group = u'g0/g0_3' permissions_setup_func(group, 'group.none', recursive=recursive) repo_items = [x for x in _get_repo_perms(group, recursive)] @@ -159,7 +159,7 @@ def test_user_permissions_on_group_with_recursive_mode_deepest(): ## set permission to g0_3 group to none recursive = 'all' - group = 'g0/g0_1/g0_1_1' + group = u'g0/g0_1/g0_1_1' permissions_setup_func(group, 'group.write', recursive=recursive) repo_items = [x for x in _get_repo_perms(group, recursive)] @@ -176,7 +176,7 @@ def test_user_permissions_on_group_with_recursive_mode_only_with_repos(): ## set permission to g0_3 group to none recursive = 'all' - group = 'g0/g0_2' + group = u'g0/g0_2' permissions_setup_func(group, 'group.admin', recursive=recursive) repo_items = [x for x in _get_repo_perms(group, recursive)] @@ -194,7 +194,7 @@ # set permission to g0/g0_1 recursive repos only mode, all children including # other repos should have this permission now set, inner groups are excluded! recursive = 'repos' - group = 'g0/g0_1' + group = u'g0/g0_1' perm = 'group.none' default_user_id = User.get_default_user().user_id @@ -227,7 +227,7 @@ def test_user_permissions_on_group_with_recursive_repo_mode_inner_group(): ## set permission to g0_3 group to none, with recursive repos only recursive = 'repos' - group = 'g0/g0_3' + group = u'g0/g0_3' perm = 'group.none' permissions_setup_func(group, perm, recursive=recursive) @@ -253,7 +253,7 @@ # other groups should have this permission now set. repositories should # remain intact as we use groups only mode ! recursive = 'groups' - group = 'g0/g0_1' + group = u'g0/g0_1' default_user_id = User.get_default_user().user_id permissions_setup_func(group, 'group.write', recursive=recursive, user_id=default_user_id) @@ -278,7 +278,7 @@ def test_user_permissions_on_group_with_recursive_group_mode_inner_group(): ## set permission to g0_3 group to none, with recursive mode for groups only recursive = 'groups' - group = 'g0/g0_3' + group = u'g0/g0_3' permissions_setup_func(group, 'group.none', recursive=recursive) repo_items = [x for x in _get_repo_perms(group, recursive)]
--- a/kallithea/tests/models/test_users.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/models/test_users.py Tue Jan 05 16:30:12 2016 +0100 @@ -28,7 +28,7 @@ self.assertEqual(User.get_by_username(u'test_user'), usr) # make user group - user_group = fixture.create_user_group('some_example_group') + user_group = fixture.create_user_group(u'some_example_group') Session().commit() UserGroupModel().add_user_to_group(user_group, usr)
--- a/kallithea/tests/other/test_mail.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/other/test_mail.py Tue Jan 05 16:30:12 2016 +0100 @@ -145,7 +145,7 @@ subject = 'subject' body = 'body' html_body = 'html_body' - author = User(name='foo', lastname='(fubar) "baz"') + author = User(name='foo', lastname=u'(fubar) "baz"') headers = {'extra': 'yes'} config_mock = {
--- a/kallithea/tests/other/test_validators.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/other/test_validators.py Tue Jan 05 16:30:12 2016 +0100 @@ -51,21 +51,21 @@ def test_ValidUserGroup(self): validator = v.ValidUserGroup() - self.assertRaises(formencode.Invalid, validator.to_python, 'default') - self.assertRaises(formencode.Invalid, validator.to_python, '.,') + self.assertRaises(formencode.Invalid, validator.to_python, u'default') + self.assertRaises(formencode.Invalid, validator.to_python, u'.,') - gr = fixture.create_user_group('test') - gr2 = fixture.create_user_group('tes2') + gr = fixture.create_user_group(u'test') + gr2 = fixture.create_user_group(u'tes2') Session().commit() - self.assertRaises(formencode.Invalid, validator.to_python, 'test') + self.assertRaises(formencode.Invalid, validator.to_python, u'test') assert gr.users_group_id is not None validator = v.ValidUserGroup(edit=True, old_data={'users_group_id': gr2.users_group_id}) - self.assertRaises(formencode.Invalid, validator.to_python, 'test') - self.assertRaises(formencode.Invalid, validator.to_python, 'TesT') - self.assertRaises(formencode.Invalid, validator.to_python, 'TEST') + self.assertRaises(formencode.Invalid, validator.to_python, u'test') + self.assertRaises(formencode.Invalid, validator.to_python, u'TesT') + self.assertRaises(formencode.Invalid, validator.to_python, u'TEST') UserGroupModel().delete(gr) UserGroupModel().delete(gr2) Session().commit() @@ -75,7 +75,7 @@ model = RepoGroupModel() self.assertRaises(formencode.Invalid, validator.to_python, {'group_name': HG_REPO, }) - gr = model.create(group_name='test_gr', group_description='desc', + gr = model.create(group_name=u'test_gr', group_description=u'desc', parent=None, just_db=True, owner=TEST_USER_ADMIN_LOGIN) @@ -147,8 +147,8 @@ self.assertRaises(formencode.Invalid, validator.to_python, {'repo_name': HG_REPO}) - gr = RepoGroupModel().create(group_name='group_test', - group_description='desc', + gr = RepoGroupModel().create(group_name=u'group_test', + group_description=u'desc', parent=None, owner=TEST_USER_ADMIN_LOGIN) self.assertRaises(formencode.Invalid,