# HG changeset patch # User Marcin Kuzminski # Date 2012-07-01 14:24:15 # Node ID 95624ce4465f08fea74f2e400d8caadc407ffda6 # Parent 473794943022ff5f30dc0619b35a1f015f4b0bc0 orginized test module - separated test models into separate files - added scripts for script tests - few fixes and renames for readability diff --git a/rhodecode/tests/models/__init__.py b/rhodecode/tests/models/__init__.py new file mode 100644 diff --git a/rhodecode/tests/test_models.py b/rhodecode/tests/models/test_notifications.py rename from rhodecode/tests/test_models.py rename to rhodecode/tests/models/test_notifications.py --- a/rhodecode/tests/test_models.py +++ b/rhodecode/tests/models/test_notifications.py @@ -2,250 +2,11 @@ import os import unittest from rhodecode.tests import * -from rhodecode.model.repos_group import ReposGroupModel -from rhodecode.model.repo import RepoModel -from rhodecode.model.db import RepoGroup, User, Notification, UserNotification, \ - UsersGroup, UsersGroupMember, Permission, UsersGroupRepoGroupToPerm,\ - Repository, UserEmailMap -from sqlalchemy.exc import IntegrityError, DatabaseError +from rhodecode.model.db import User, Notification, UserNotification from rhodecode.model.user import UserModel from rhodecode.model.meta import Session from rhodecode.model.notification import NotificationModel -from rhodecode.model.users_group import UsersGroupModel -from rhodecode.lib.auth import AuthUser - - -def _make_group(path, desc='desc', parent_id=None, - skip_if_exists=False): - - gr = RepoGroup.get_by_group_name(path) - if gr and skip_if_exists: - return gr - - gr = ReposGroupModel().create(path, desc, parent_id) - return gr - - -class TestReposGroups(unittest.TestCase): - - def setUp(self): - self.g1 = _make_group('test1', skip_if_exists=True) - Session.commit() - self.g2 = _make_group('test2', skip_if_exists=True) - Session.commit() - self.g3 = _make_group('test3', skip_if_exists=True) - Session.commit() - - def tearDown(self): - print 'out' - - def __check_path(self, *path): - """ - Checks the path for existance ! - """ - path = [TESTS_TMP_PATH] + list(path) - path = os.path.join(*path) - return os.path.isdir(path) - - def _check_folders(self): - print os.listdir(TESTS_TMP_PATH) - - def __delete_group(self, id_): - ReposGroupModel().delete(id_) - - def __update_group(self, id_, path, desc='desc', parent_id=None): - form_data = dict( - group_name=path, - group_description=desc, - group_parent_id=parent_id, - perms_updates=[], - perms_new=[] - ) - gr = ReposGroupModel().update(id_, form_data) - return gr - - def test_create_group(self): - g = _make_group('newGroup') - self.assertEqual(g.full_path, 'newGroup') - - self.assertTrue(self.__check_path('newGroup')) - - def test_create_same_name_group(self): - self.assertRaises(IntegrityError, lambda:_make_group('newGroup')) - Session.rollback() - - def test_same_subgroup(self): - sg1 = _make_group('sub1', 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 = _make_group('subsub1', 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 = _make_group('deleteme') - self.__delete_group(sg1.group_id) - - self.assertEqual(RepoGroup.get(sg1.group_id), None) - self.assertFalse(self.__check_path('deteteme')) - - sg1 = _make_group('deleteme', 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 = _make_group('initial') - - new_sg1 = self.__update_group(sg1.group_id, 'after') - self.assertTrue(self.__check_path('after')) - self.assertEqual(RepoGroup.get_by_group_name('initial'), None) - - def test_update_group_parent(self): - - sg1 = _make_group('initial', parent_id=self.g1.group_id) - - new_sg1 = self.__update_group(sg1.group_id, 'after', parent_id=self.g1.group_id) - self.assertTrue(self.__check_path('test1', 'after')) - self.assertEqual(RepoGroup.get_by_group_name('test1/initial'), None) - - new_sg1 = self.__update_group(sg1.group_id, 'after', parent_id=self.g3.group_id) - self.assertTrue(self.__check_path('test3', 'after')) - self.assertEqual(RepoGroup.get_by_group_name('test3/initial'), None) - - new_sg1 = self.__update_group(sg1.group_id, 'hello') - self.assertTrue(self.__check_path('hello')) - - self.assertEqual(RepoGroup.get_by_group_name('hello'), new_sg1) - - def test_subgrouping_with_repo(self): - - g1 = _make_group('g1') - g2 = _make_group('g2') - - # create new repo - form_data = dict(repo_name='john', - repo_name_full='john', - fork_name=None, - description=None, - repo_group=None, - private=False, - repo_type='hg', - clone_uri=None, - landing_rev='tip') - cur_user = User.get_by_username(TEST_USER_ADMIN_LOGIN) - r = RepoModel().create(form_data, cur_user) - - self.assertEqual(r.repo_name, 'john') - - # put repo into group - form_data = form_data - form_data['repo_group'] = g1.group_id - form_data['perms_new'] = [] - form_data['perms_updates'] = [] - RepoModel().update(r.repo_name, form_data) - self.assertEqual(r.repo_name, 'g1/john') - - self.__update_group(g1.group_id, 'g1', parent_id=g2.group_id) - self.assertTrue(self.__check_path('g2', 'g1')) - - # test repo - self.assertEqual(r.repo_name, RepoGroup.url_sep().join(['g2', 'g1', r.just_name])) - - def test_move_to_root(self): - g1 = _make_group('t11') - Session.commit() - g2 = _make_group('t22', parent_id=g1.group_id) - Session.commit() - - self.assertEqual(g2.full_path, 't11/t22') - self.assertTrue(self.__check_path('t11', 't22')) - - g2 = self.__update_group(g2.group_id, 'g22', parent_id=None) - Session.commit() - - self.assertEqual(g2.group_name, 'g22') - # we moved out group from t1 to '' so it's full path should be 'g2' - self.assertEqual(g2.full_path, 'g22') - self.assertFalse(self.__check_path('t11', 't22')) - self.assertTrue(self.__check_path('g22')) - - -class TestUser(unittest.TestCase): - def __init__(self, methodName='runTest'): - Session.remove() - super(TestUser, self).__init__(methodName=methodName) - - def test_create_and_remove(self): - usr = UserModel().create_or_update(username=u'test_user', - password=u'qweqwe', - email=u'u232@rhodecode.org', - firstname=u'u1', lastname=u'u1') - Session.commit() - self.assertEqual(User.get_by_username(u'test_user'), usr) - - # make users group - users_group = UsersGroupModel().create('some_example_group') - Session.commit() - - UsersGroupModel().add_user_to_group(users_group, usr) - Session.commit() - - self.assertEqual(UsersGroup.get(users_group.users_group_id), users_group) - self.assertEqual(UsersGroupMember.query().count(), 1) - UserModel().delete(usr.user_id) - Session.commit() - - self.assertEqual(UsersGroupMember.query().all(), []) - - def test_additonal_email_as_main(self): - usr = UserModel().create_or_update(username=u'test_user', - password=u'qweqwe', - email=u'main_email@rhodecode.org', - firstname=u'u1', lastname=u'u1') - Session.commit() - - def do(): - m = UserEmailMap() - m.email = u'main_email@rhodecode.org' - m.user = usr - Session.add(m) - Session.commit() - self.assertRaises(AttributeError, do) - - UserModel().delete(usr.user_id) - Session.commit() - - def test_extra_email_map(self): - usr = UserModel().create_or_update(username=u'test_user', - password=u'qweqwe', - email=u'main_email@rhodecode.org', - firstname=u'u1', lastname=u'u1') - Session.commit() - - m = UserEmailMap() - m.email = u'main_email2@rhodecode.org' - m.user = usr - Session.add(m) - Session.commit() - - u = User.get_by_email(email='main_email@rhodecode.org') - self.assertEqual(usr.user_id, u.user_id) - self.assertEqual(usr.username, u.username) - - u = User.get_by_email(email='main_email2@rhodecode.org') - self.assertEqual(usr.user_id, u.user_id) - self.assertEqual(usr.username, u.username) - u = User.get_by_email(email='main_email3@rhodecode.org') - self.assertEqual(None, u) - - UserModel().delete(usr.user_id) - Session.commit() class TestNotifications(unittest.TestCase): @@ -256,30 +17,30 @@ class TestNotifications(unittest.TestCas password=u'qweqwe', email=u'u1@rhodecode.org', firstname=u'u1', lastname=u'u1') - Session.commit() + Session().commit() self.u1 = self.u1.user_id self.u2 = UserModel().create_or_update(username=u'u2', password=u'qweqwe', email=u'u2@rhodecode.org', firstname=u'u2', lastname=u'u3') - Session.commit() + Session().commit() self.u2 = self.u2.user_id self.u3 = UserModel().create_or_update(username=u'u3', password=u'qweqwe', email=u'u3@rhodecode.org', firstname=u'u3', lastname=u'u3') - Session.commit() + Session().commit() self.u3 = self.u3.user_id super(TestNotifications, self).__init__(methodName=methodName) def _clean_notifications(self): for n in Notification.query().all(): - Session.delete(n) + Session().delete(n) - Session.commit() + Session().commit() self.assertEqual(Notification.query().all(), []) def tearDown(self): @@ -293,7 +54,7 @@ class TestNotifications(unittest.TestCas notification = NotificationModel().create(created_by=self.u1, subject=u'subj', body=u'hi there', recipients=usrs) - Session.commit() + Session().commit() u1 = User.get(self.u1) u2 = User.get(self.u2) u3 = User.get(self.u3) @@ -316,12 +77,12 @@ class TestNotifications(unittest.TestCas notification1 = NotificationModel().create(created_by=self.u1, subject=u'subj', body=u'hi there1', recipients=[self.u3]) - Session.commit() + Session().commit() notification2 = NotificationModel().create(created_by=self.u1, subject=u'subj', body=u'hi there2', recipients=[self.u3]) - Session.commit() - u3 = Session.query(User).get(self.u3) + Session().commit() + u3 = Session().query(User).get(self.u3) self.assertEqual(sorted([x.notification for x in u3.notifications]), sorted([notification2, notification1])) @@ -333,12 +94,12 @@ class TestNotifications(unittest.TestCas notification = NotificationModel().create(created_by=self.u1, subject=u'title', body=u'hi there3', recipients=[self.u3, self.u1, self.u2]) - Session.commit() + Session().commit() notifications = Notification.query().all() self.assertTrue(notification in notifications) Notification.delete(notification.notification_id) - Session.commit() + Session().commit() notifications = Notification.query().all() self.assertFalse(notification in notifications) @@ -355,7 +116,7 @@ class TestNotifications(unittest.TestCas notification = NotificationModel().create(created_by=self.u1, subject=u'title', body=u'hi there3', recipients=[self.u3, self.u1, self.u2]) - Session.commit() + Session().commit() unotification = UserNotification.query()\ .filter(UserNotification.notification == @@ -367,7 +128,7 @@ class TestNotifications(unittest.TestCas NotificationModel().delete(self.u3, notification.notification_id) - Session.commit() + Session().commit() u3notification = UserNotification.query()\ .filter(UserNotification.notification == @@ -402,7 +163,7 @@ class TestNotifications(unittest.TestCas NotificationModel().create(created_by=self.u1, subject=u'title', body=u'hi there_delete', recipients=[self.u3, self.u1]) - Session.commit() + Session().commit() self.assertEqual(NotificationModel() .get_unread_cnt_for_user(self.u1), 1) @@ -414,7 +175,7 @@ class TestNotifications(unittest.TestCas notification = NotificationModel().create(created_by=self.u1, subject=u'title', body=u'hi there3', recipients=[self.u3, self.u1, self.u2]) - Session.commit() + Session().commit() self.assertEqual(NotificationModel() .get_unread_cnt_for_user(self.u1), 2) @@ -424,338 +185,5 @@ class TestNotifications(unittest.TestCas .get_unread_cnt_for_user(self.u3), 2) -class TestUsers(unittest.TestCase): - - def __init__(self, methodName='runTest'): - super(TestUsers, self).__init__(methodName=methodName) - - def setUp(self): - self.u1 = UserModel().create_or_update(username=u'u1', - password=u'qweqwe', - email=u'u1@rhodecode.org', - firstname=u'u1', lastname=u'u1') - - def tearDown(self): - perm = Permission.query().all() - for p in perm: - UserModel().revoke_perm(self.u1, p) - - UserModel().delete(self.u1) - Session.commit() - - def test_add_perm(self): - perm = Permission.query().all()[0] - UserModel().grant_perm(self.u1, perm) - Session.commit() - self.assertEqual(UserModel().has_perm(self.u1, perm), True) - - def test_has_perm(self): - perm = Permission.query().all() - for p in perm: - has_p = UserModel().has_perm(self.u1, p) - self.assertEqual(False, has_p) - - def test_revoke_perm(self): - perm = Permission.query().all()[0] - UserModel().grant_perm(self.u1, perm) - Session.commit() - self.assertEqual(UserModel().has_perm(self.u1, perm), True) - - #revoke - UserModel().revoke_perm(self.u1, perm) - Session.commit() - self.assertEqual(UserModel().has_perm(self.u1, perm), False) -class TestPermissions(unittest.TestCase): - def __init__(self, methodName='runTest'): - super(TestPermissions, self).__init__(methodName=methodName) - - def setUp(self): - self.u1 = UserModel().create_or_update( - username=u'u1', password=u'qweqwe', - email=u'u1@rhodecode.org', firstname=u'u1', lastname=u'u1' - ) - self.u2 = UserModel().create_or_update( - username=u'u2', password=u'qweqwe', - email=u'u2@rhodecode.org', firstname=u'u2', lastname=u'u2' - ) - self.anon = User.get_by_username('default') - self.a1 = UserModel().create_or_update( - username=u'a1', password=u'qweqwe', - email=u'a1@rhodecode.org', firstname=u'a1', lastname=u'a1', admin=True - ) - Session.commit() - - def tearDown(self): - if hasattr(self, 'test_repo'): - RepoModel().delete(repo=self.test_repo) - UserModel().delete(self.u1) - UserModel().delete(self.u2) - UserModel().delete(self.a1) - if hasattr(self, 'g1'): - ReposGroupModel().delete(self.g1.group_id) - if hasattr(self, 'g2'): - ReposGroupModel().delete(self.g2.group_id) - - if hasattr(self, 'ug1'): - UsersGroupModel().delete(self.ug1, force=True) - - Session.commit() - - def test_default_perms_set(self): - 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': {u'vcs_test_hg': u'repository.read'} - } - self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], - perms['repositories'][HG_REPO]) - new_perm = 'repository.write' - RepoModel().grant_user_permission(repo=HG_REPO, user=self.u1, perm=new_perm) - Session.commit() - - u1_auth = AuthUser(user_id=self.u1.user_id) - self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], new_perm) - - def test_default_admin_perms_set(self): - a1_auth = AuthUser(user_id=self.a1.user_id) - perms = { - 'repositories_groups': {}, - 'global': set([u'hg.admin']), - 'repositories': {u'vcs_test_hg': u'repository.admin'} - } - self.assertEqual(a1_auth.permissions['repositories'][HG_REPO], - perms['repositories'][HG_REPO]) - new_perm = 'repository.write' - RepoModel().grant_user_permission(repo=HG_REPO, user=self.a1, perm=new_perm) - Session.commit() - # cannot really downgrade admins permissions !? they still get's set as - # admin ! - u1_auth = AuthUser(user_id=self.a1.user_id) - self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], - perms['repositories'][HG_REPO]) - - def test_default_group_perms(self): - self.g1 = _make_group('test1', skip_if_exists=True) - self.g2 = _make_group('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'}, - 'global': set([u'hg.create.repository', u'repository.read', u'hg.register.manual_activate']), - 'repositories': {u'vcs_test_hg': u'repository.read'} - } - self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], - perms['repositories'][HG_REPO]) - self.assertEqual(u1_auth.permissions['repositories_groups'], - perms['repositories_groups']) - - def test_default_admin_group_perms(self): - self.g1 = _make_group('test1', skip_if_exists=True) - self.g2 = _make_group('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'}, - 'global': set(['hg.admin']), - 'repositories': {u'vcs_test_hg': 'repository.admin'} - } - - self.assertEqual(a1_auth.permissions['repositories'][HG_REPO], - perms['repositories'][HG_REPO]) - self.assertEqual(a1_auth.permissions['repositories_groups'], - perms['repositories_groups']) - - def test_propagated_permission_from_users_group(self): - # make group - self.ug1 = UsersGroupModel().create('G1') - # add user to group - UsersGroupModel().add_user_to_group(self.ug1, self.u1) - - # set permission to lower - new_perm = 'repository.none' - RepoModel().grant_user_permission(repo=HG_REPO, user=self.u1, perm=new_perm) - Session.commit() - u1_auth = AuthUser(user_id=self.u1.user_id) - self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], - new_perm) - - # grant perm for group this should override permission from user - new_perm = 'repository.write' - RepoModel().grant_users_group_permission(repo=HG_REPO, - group_name=self.ug1, - perm=new_perm) - # check perms - 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': {u'vcs_test_hg': u'repository.read'} - } - self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], - new_perm) - self.assertEqual(u1_auth.permissions['repositories_groups'], - perms['repositories_groups']) - - def test_propagated_permission_from_users_group_lower_weight(self): - # make group - self.ug1 = UsersGroupModel().create('G1') - # add user to group - UsersGroupModel().add_user_to_group(self.ug1, self.u1) - - # set permission to lower - new_perm_h = 'repository.write' - RepoModel().grant_user_permission(repo=HG_REPO, user=self.u1, - perm=new_perm_h) - Session.commit() - u1_auth = AuthUser(user_id=self.u1.user_id) - self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], - new_perm_h) - - # grant perm for group this should NOT override permission from user - # since it's lower than granted - new_perm_l = 'repository.read' - RepoModel().grant_users_group_permission(repo=HG_REPO, - group_name=self.ug1, - perm=new_perm_l) - # check perms - 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': {u'vcs_test_hg': u'repository.write'} - } - self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], - new_perm_h) - self.assertEqual(u1_auth.permissions['repositories_groups'], - perms['repositories_groups']) - - def test_repo_in_group_permissions(self): - self.g1 = _make_group('group1', skip_if_exists=True) - self.g2 = _make_group('group2', skip_if_exists=True) - Session.commit() - # both perms should be read ! - u1_auth = AuthUser(user_id=self.u1.user_id) - self.assertEqual(u1_auth.permissions['repositories_groups'], - {u'group1': u'group.read', u'group2': u'group.read'}) - - a1_auth = AuthUser(user_id=self.anon.user_id) - self.assertEqual(a1_auth.permissions['repositories_groups'], - {u'group1': u'group.read', u'group2': u'group.read'}) - - #Change perms to none for both groups - ReposGroupModel().grant_user_permission(repos_group=self.g1, - user=self.anon, - perm='group.none') - ReposGroupModel().grant_user_permission(repos_group=self.g2, - user=self.anon, - perm='group.none') - - u1_auth = AuthUser(user_id=self.u1.user_id) - self.assertEqual(u1_auth.permissions['repositories_groups'], - {u'group1': u'group.none', u'group2': u'group.none'}) - - a1_auth = AuthUser(user_id=self.anon.user_id) - self.assertEqual(a1_auth.permissions['repositories_groups'], - {u'group1': u'group.none', u'group2': u'group.none'}) - - # add repo to group - form_data = { - 'repo_name': HG_REPO, - 'repo_name_full': RepoGroup.url_sep().join([self.g1.group_name,HG_REPO]), - 'repo_type': 'hg', - 'clone_uri': '', - 'repo_group': self.g1.group_id, - 'description': 'desc', - 'private': False, - 'landing_rev': 'tip' - } - self.test_repo = RepoModel().create(form_data, cur_user=self.u1) - Session.commit() - - u1_auth = AuthUser(user_id=self.u1.user_id) - self.assertEqual(u1_auth.permissions['repositories_groups'], - {u'group1': u'group.none', u'group2': u'group.none'}) - - a1_auth = AuthUser(user_id=self.anon.user_id) - self.assertEqual(a1_auth.permissions['repositories_groups'], - {u'group1': u'group.none', u'group2': u'group.none'}) - - #grant permission for u2 ! - ReposGroupModel().grant_user_permission(repos_group=self.g1, - user=self.u2, - perm='group.read') - ReposGroupModel().grant_user_permission(repos_group=self.g2, - user=self.u2, - perm='group.read') - Session.commit() - self.assertNotEqual(self.u1, self.u2) - #u1 and anon should have not change perms while u2 should ! - u1_auth = AuthUser(user_id=self.u1.user_id) - self.assertEqual(u1_auth.permissions['repositories_groups'], - {u'group1': u'group.none', u'group2': u'group.none'}) - - u2_auth = AuthUser(user_id=self.u2.user_id) - self.assertEqual(u2_auth.permissions['repositories_groups'], - {u'group1': u'group.read', u'group2': u'group.read'}) - - a1_auth = AuthUser(user_id=self.anon.user_id) - self.assertEqual(a1_auth.permissions['repositories_groups'], - {u'group1': u'group.none', u'group2': u'group.none'}) - - def test_repo_group_user_as_user_group_member(self): - # create Group1 - self.g1 = _make_group('group1', skip_if_exists=True) - Session.commit() - a1_auth = AuthUser(user_id=self.anon.user_id) - - self.assertEqual(a1_auth.permissions['repositories_groups'], - {u'group1': u'group.read'}) - - # set default permission to none - ReposGroupModel().grant_user_permission(repos_group=self.g1, - user=self.anon, - perm='group.none') - # make group - self.ug1 = UsersGroupModel().create('G1') - # add user to group - UsersGroupModel().add_user_to_group(self.ug1, self.u1) - Session.commit() - - # check if user is in the group - membrs = [x.user_id for x in UsersGroupModel().get(self.ug1.users_group_id).members] - self.assertEqual(membrs, [self.u1.user_id]) - # add some user to that group - - # check his permissions - a1_auth = AuthUser(user_id=self.anon.user_id) - self.assertEqual(a1_auth.permissions['repositories_groups'], - {u'group1': u'group.none'}) - - u1_auth = AuthUser(user_id=self.u1.user_id) - self.assertEqual(u1_auth.permissions['repositories_groups'], - {u'group1': u'group.none'}) - - # grant ug1 read permissions for - ReposGroupModel().grant_users_group_permission(repos_group=self.g1, - group_name=self.ug1, - perm='group.read') - Session.commit() - # check if the - obj = Session.query(UsersGroupRepoGroupToPerm)\ - .filter(UsersGroupRepoGroupToPerm.group == self.g1)\ - .filter(UsersGroupRepoGroupToPerm.users_group == self.ug1)\ - .scalar() - self.assertEqual(obj.permission.permission_name, 'group.read') - - a1_auth = AuthUser(user_id=self.anon.user_id) - - self.assertEqual(a1_auth.permissions['repositories_groups'], - {u'group1': u'group.none'}) - - u1_auth = AuthUser(user_id=self.u1.user_id) - self.assertEqual(u1_auth.permissions['repositories_groups'], - {u'group1': u'group.read'}) diff --git a/rhodecode/tests/models/test_permissions.py b/rhodecode/tests/models/test_permissions.py new file mode 100644 --- /dev/null +++ b/rhodecode/tests/models/test_permissions.py @@ -0,0 +1,316 @@ +import os +import unittest +from rhodecode.tests import * + +from rhodecode.model.repos_group import ReposGroupModel +from rhodecode.model.repo import RepoModel +from rhodecode.model.db import RepoGroup, User, UsersGroupRepoGroupToPerm +from rhodecode.model.user import UserModel + +from rhodecode.model.meta import Session +from rhodecode.model.users_group import UsersGroupModel +from rhodecode.lib.auth import AuthUser + + +def _make_group(path, desc='desc', parent_id=None, + skip_if_exists=False): + + gr = RepoGroup.get_by_group_name(path) + if gr and skip_if_exists: + return gr + + gr = ReposGroupModel().create(path, desc, parent_id) + return gr + + +class TestPermissions(unittest.TestCase): + def __init__(self, methodName='runTest'): + super(TestPermissions, self).__init__(methodName=methodName) + + def setUp(self): + self.u1 = UserModel().create_or_update( + username=u'u1', password=u'qweqwe', + email=u'u1@rhodecode.org', firstname=u'u1', lastname=u'u1' + ) + self.u2 = UserModel().create_or_update( + username=u'u2', password=u'qweqwe', + email=u'u2@rhodecode.org', firstname=u'u2', lastname=u'u2' + ) + self.anon = User.get_by_username('default') + self.a1 = UserModel().create_or_update( + username=u'a1', password=u'qweqwe', + email=u'a1@rhodecode.org', firstname=u'a1', lastname=u'a1', admin=True + ) + Session().commit() + + def tearDown(self): + if hasattr(self, 'test_repo'): + RepoModel().delete(repo=self.test_repo) + UserModel().delete(self.u1) + UserModel().delete(self.u2) + UserModel().delete(self.a1) + if hasattr(self, 'g1'): + ReposGroupModel().delete(self.g1.group_id) + if hasattr(self, 'g2'): + ReposGroupModel().delete(self.g2.group_id) + + if hasattr(self, 'ug1'): + UsersGroupModel().delete(self.ug1, force=True) + + Session().commit() + + def test_default_perms_set(self): + 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': {u'vcs_test_hg': u'repository.read'} + } + self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], + perms['repositories'][HG_REPO]) + new_perm = 'repository.write' + RepoModel().grant_user_permission(repo=HG_REPO, user=self.u1, + perm=new_perm) + Session().commit() + + u1_auth = AuthUser(user_id=self.u1.user_id) + self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], + new_perm) + + def test_default_admin_perms_set(self): + a1_auth = AuthUser(user_id=self.a1.user_id) + perms = { + 'repositories_groups': {}, + 'global': set([u'hg.admin']), + 'repositories': {u'vcs_test_hg': u'repository.admin'} + } + self.assertEqual(a1_auth.permissions['repositories'][HG_REPO], + perms['repositories'][HG_REPO]) + new_perm = 'repository.write' + RepoModel().grant_user_permission(repo=HG_REPO, user=self.a1, + perm=new_perm) + Session().commit() + # cannot really downgrade admins permissions !? they still get's set as + # admin ! + u1_auth = AuthUser(user_id=self.a1.user_id) + self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], + perms['repositories'][HG_REPO]) + + def test_default_group_perms(self): + self.g1 = _make_group('test1', skip_if_exists=True) + self.g2 = _make_group('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'}, + 'global': set([u'hg.create.repository', u'repository.read', u'hg.register.manual_activate']), + 'repositories': {u'vcs_test_hg': u'repository.read'} + } + self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], + perms['repositories'][HG_REPO]) + self.assertEqual(u1_auth.permissions['repositories_groups'], + perms['repositories_groups']) + + def test_default_admin_group_perms(self): + self.g1 = _make_group('test1', skip_if_exists=True) + self.g2 = _make_group('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'}, + 'global': set(['hg.admin']), + 'repositories': {u'vcs_test_hg': 'repository.admin'} + } + + self.assertEqual(a1_auth.permissions['repositories'][HG_REPO], + perms['repositories'][HG_REPO]) + self.assertEqual(a1_auth.permissions['repositories_groups'], + perms['repositories_groups']) + + def test_propagated_permission_from_users_group(self): + # make group + self.ug1 = UsersGroupModel().create('G1') + # add user to group + UsersGroupModel().add_user_to_group(self.ug1, self.u1) + + # set permission to lower + new_perm = 'repository.none' + RepoModel().grant_user_permission(repo=HG_REPO, user=self.u1, perm=new_perm) + Session().commit() + u1_auth = AuthUser(user_id=self.u1.user_id) + self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], + new_perm) + + # grant perm for group this should override permission from user + new_perm = 'repository.write' + RepoModel().grant_users_group_permission(repo=HG_REPO, + group_name=self.ug1, + perm=new_perm) + # check perms + 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': {u'vcs_test_hg': u'repository.read'} + } + self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], + new_perm) + self.assertEqual(u1_auth.permissions['repositories_groups'], + perms['repositories_groups']) + + def test_propagated_permission_from_users_group_lower_weight(self): + # make group + self.ug1 = UsersGroupModel().create('G1') + # add user to group + UsersGroupModel().add_user_to_group(self.ug1, self.u1) + + # set permission to lower + new_perm_h = 'repository.write' + RepoModel().grant_user_permission(repo=HG_REPO, user=self.u1, + perm=new_perm_h) + Session().commit() + u1_auth = AuthUser(user_id=self.u1.user_id) + self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], + new_perm_h) + + # grant perm for group this should NOT override permission from user + # since it's lower than granted + new_perm_l = 'repository.read' + RepoModel().grant_users_group_permission(repo=HG_REPO, + group_name=self.ug1, + perm=new_perm_l) + # check perms + 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': {u'vcs_test_hg': u'repository.write'} + } + self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], + new_perm_h) + self.assertEqual(u1_auth.permissions['repositories_groups'], + perms['repositories_groups']) + + def test_repo_in_group_permissions(self): + self.g1 = _make_group('group1', skip_if_exists=True) + self.g2 = _make_group('group2', skip_if_exists=True) + Session().commit() + # both perms should be read ! + u1_auth = AuthUser(user_id=self.u1.user_id) + self.assertEqual(u1_auth.permissions['repositories_groups'], + {u'group1': u'group.read', u'group2': u'group.read'}) + + a1_auth = AuthUser(user_id=self.anon.user_id) + self.assertEqual(a1_auth.permissions['repositories_groups'], + {u'group1': u'group.read', u'group2': u'group.read'}) + + #Change perms to none for both groups + ReposGroupModel().grant_user_permission(repos_group=self.g1, + user=self.anon, + perm='group.none') + ReposGroupModel().grant_user_permission(repos_group=self.g2, + user=self.anon, + perm='group.none') + + u1_auth = AuthUser(user_id=self.u1.user_id) + self.assertEqual(u1_auth.permissions['repositories_groups'], + {u'group1': u'group.none', u'group2': u'group.none'}) + + a1_auth = AuthUser(user_id=self.anon.user_id) + self.assertEqual(a1_auth.permissions['repositories_groups'], + {u'group1': u'group.none', u'group2': u'group.none'}) + + # add repo to group + name = RepoGroup.url_sep().join([self.g1.group_name, 'test_perm']) + self.test_repo = RepoModel().create_repo( + repo_name=name, + repo_type='hg', + description='', + owner=self.u1, + ) + Session().commit() + + u1_auth = AuthUser(user_id=self.u1.user_id) + self.assertEqual(u1_auth.permissions['repositories_groups'], + {u'group1': u'group.none', u'group2': u'group.none'}) + + a1_auth = AuthUser(user_id=self.anon.user_id) + self.assertEqual(a1_auth.permissions['repositories_groups'], + {u'group1': u'group.none', u'group2': u'group.none'}) + + #grant permission for u2 ! + ReposGroupModel().grant_user_permission(repos_group=self.g1, + user=self.u2, + perm='group.read') + ReposGroupModel().grant_user_permission(repos_group=self.g2, + user=self.u2, + perm='group.read') + Session().commit() + self.assertNotEqual(self.u1, self.u2) + #u1 and anon should have not change perms while u2 should ! + u1_auth = AuthUser(user_id=self.u1.user_id) + self.assertEqual(u1_auth.permissions['repositories_groups'], + {u'group1': u'group.none', u'group2': u'group.none'}) + + u2_auth = AuthUser(user_id=self.u2.user_id) + self.assertEqual(u2_auth.permissions['repositories_groups'], + {u'group1': u'group.read', u'group2': u'group.read'}) + + a1_auth = AuthUser(user_id=self.anon.user_id) + self.assertEqual(a1_auth.permissions['repositories_groups'], + {u'group1': u'group.none', u'group2': u'group.none'}) + + def test_repo_group_user_as_user_group_member(self): + # create Group1 + self.g1 = _make_group('group1', skip_if_exists=True) + Session().commit() + a1_auth = AuthUser(user_id=self.anon.user_id) + + self.assertEqual(a1_auth.permissions['repositories_groups'], + {u'group1': u'group.read'}) + + # set default permission to none + ReposGroupModel().grant_user_permission(repos_group=self.g1, + user=self.anon, + perm='group.none') + # make group + self.ug1 = UsersGroupModel().create('G1') + # add user to group + UsersGroupModel().add_user_to_group(self.ug1, self.u1) + Session().commit() + + # check if user is in the group + membrs = [x.user_id for x in UsersGroupModel().get(self.ug1.users_group_id).members] + self.assertEqual(membrs, [self.u1.user_id]) + # add some user to that group + + # check his permissions + a1_auth = AuthUser(user_id=self.anon.user_id) + self.assertEqual(a1_auth.permissions['repositories_groups'], + {u'group1': u'group.none'}) + + u1_auth = AuthUser(user_id=self.u1.user_id) + self.assertEqual(u1_auth.permissions['repositories_groups'], + {u'group1': u'group.none'}) + + # grant ug1 read permissions for + ReposGroupModel().grant_users_group_permission(repos_group=self.g1, + group_name=self.ug1, + perm='group.read') + Session().commit() + # check if the + obj = Session().query(UsersGroupRepoGroupToPerm)\ + .filter(UsersGroupRepoGroupToPerm.group == self.g1)\ + .filter(UsersGroupRepoGroupToPerm.users_group == self.ug1)\ + .scalar() + self.assertEqual(obj.permission.permission_name, 'group.read') + + a1_auth = AuthUser(user_id=self.anon.user_id) + + self.assertEqual(a1_auth.permissions['repositories_groups'], + {u'group1': u'group.none'}) + + u1_auth = AuthUser(user_id=self.u1.user_id) + self.assertEqual(u1_auth.permissions['repositories_groups'], + {u'group1': u'group.read'}) diff --git a/rhodecode/tests/models/test_repos_groups.py b/rhodecode/tests/models/test_repos_groups.py new file mode 100644 --- /dev/null +++ b/rhodecode/tests/models/test_repos_groups.py @@ -0,0 +1,170 @@ +import os +import unittest +from rhodecode.tests import * + +from rhodecode.model.repos_group import ReposGroupModel +from rhodecode.model.repo import RepoModel +from rhodecode.model.db import RepoGroup, User +from rhodecode.model.meta import Session +from sqlalchemy.exc import IntegrityError + + +def _make_group(path, desc='desc', parent_id=None, + skip_if_exists=False): + + gr = RepoGroup.get_by_group_name(path) + if gr and skip_if_exists: + return gr + + gr = ReposGroupModel().create(path, desc, parent_id) + return gr + + +class TestReposGroups(unittest.TestCase): + + def setUp(self): + self.g1 = _make_group('test1', skip_if_exists=True) + Session().commit() + self.g2 = _make_group('test2', skip_if_exists=True) + Session().commit() + self.g3 = _make_group('test3', skip_if_exists=True) + Session().commit() + + def tearDown(self): + print 'out' + + def __check_path(self, *path): + """ + Checks the path for existance ! + """ + path = [TESTS_TMP_PATH] + list(path) + path = os.path.join(*path) + return os.path.isdir(path) + + def _check_folders(self): + print os.listdir(TESTS_TMP_PATH) + + def __delete_group(self, id_): + ReposGroupModel().delete(id_) + + def __update_group(self, id_, path, desc='desc', parent_id=None): + form_data = dict( + group_name=path, + group_description=desc, + group_parent_id=parent_id, + perms_updates=[], + perms_new=[] + ) + gr = ReposGroupModel().update(id_, form_data) + return gr + + def test_create_group(self): + g = _make_group('newGroup') + self.assertEqual(g.full_path, 'newGroup') + + self.assertTrue(self.__check_path('newGroup')) + + def test_create_same_name_group(self): + self.assertRaises(IntegrityError, lambda: _make_group('newGroup')) + Session().rollback() + + def test_same_subgroup(self): + sg1 = _make_group('sub1', 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 = _make_group('subsub1', 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 = _make_group('deleteme') + self.__delete_group(sg1.group_id) + + self.assertEqual(RepoGroup.get(sg1.group_id), None) + self.assertFalse(self.__check_path('deteteme')) + + sg1 = _make_group('deleteme', 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 = _make_group('initial') + + new_sg1 = self.__update_group(sg1.group_id, 'after') + self.assertTrue(self.__check_path('after')) + self.assertEqual(RepoGroup.get_by_group_name('initial'), None) + + def test_update_group_parent(self): + + sg1 = _make_group('initial', parent_id=self.g1.group_id) + + new_sg1 = self.__update_group(sg1.group_id, 'after', parent_id=self.g1.group_id) + self.assertTrue(self.__check_path('test1', 'after')) + self.assertEqual(RepoGroup.get_by_group_name('test1/initial'), None) + + new_sg1 = self.__update_group(sg1.group_id, 'after', parent_id=self.g3.group_id) + self.assertTrue(self.__check_path('test3', 'after')) + self.assertEqual(RepoGroup.get_by_group_name('test3/initial'), None) + + new_sg1 = self.__update_group(sg1.group_id, 'hello') + self.assertTrue(self.__check_path('hello')) + + self.assertEqual(RepoGroup.get_by_group_name('hello'), new_sg1) + + def test_subgrouping_with_repo(self): + + g1 = _make_group('g1') + g2 = _make_group('g2') + + # create new repo + form_data = dict(repo_name='john', + repo_name_full='john', + fork_name=None, + description=None, + repo_group=None, + private=False, + repo_type='hg', + clone_uri=None, + landing_rev='tip') + cur_user = User.get_by_username(TEST_USER_ADMIN_LOGIN) + r = RepoModel().create(form_data, cur_user) + + self.assertEqual(r.repo_name, 'john') + + # put repo into group + form_data = form_data + form_data['repo_group'] = g1.group_id + form_data['perms_new'] = [] + form_data['perms_updates'] = [] + RepoModel().update(r.repo_name, form_data) + self.assertEqual(r.repo_name, 'g1/john') + + self.__update_group(g1.group_id, 'g1', parent_id=g2.group_id) + self.assertTrue(self.__check_path('g2', 'g1')) + + # test repo + self.assertEqual(r.repo_name, RepoGroup.url_sep().join(['g2', 'g1', + r.just_name])) + + def test_move_to_root(self): + g1 = _make_group('t11') + Session().commit() + g2 = _make_group('t22', parent_id=g1.group_id) + Session().commit() + + self.assertEqual(g2.full_path, 't11/t22') + self.assertTrue(self.__check_path('t11', 't22')) + + g2 = self.__update_group(g2.group_id, 'g22', parent_id=None) + Session().commit() + + self.assertEqual(g2.group_name, 'g22') + # we moved out group from t1 to '' so it's full path should be 'g2' + self.assertEqual(g2.full_path, 'g22') + self.assertFalse(self.__check_path('t11', 't22')) + self.assertTrue(self.__check_path('g22')) \ No newline at end of file diff --git a/rhodecode/tests/models/test_users.py b/rhodecode/tests/models/test_users.py new file mode 100644 --- /dev/null +++ b/rhodecode/tests/models/test_users.py @@ -0,0 +1,124 @@ +import unittest +from rhodecode.tests import * + +from rhodecode.model.db import User, UsersGroup, UsersGroupMember, UserEmailMap,\ + Permission +from rhodecode.model.user import UserModel + +from rhodecode.model.meta import Session +from rhodecode.model.users_group import UsersGroupModel + + +class TestUser(unittest.TestCase): + def __init__(self, methodName='runTest'): + Session.remove() + super(TestUser, self).__init__(methodName=methodName) + + def test_create_and_remove(self): + usr = UserModel().create_or_update(username=u'test_user', + password=u'qweqwe', + email=u'u232@rhodecode.org', + firstname=u'u1', lastname=u'u1') + Session().commit() + self.assertEqual(User.get_by_username(u'test_user'), usr) + + # make users group + users_group = UsersGroupModel().create('some_example_group') + Session().commit() + + UsersGroupModel().add_user_to_group(users_group, usr) + Session().commit() + + self.assertEqual(UsersGroup.get(users_group.users_group_id), users_group) + self.assertEqual(UsersGroupMember.query().count(), 1) + UserModel().delete(usr.user_id) + Session().commit() + + self.assertEqual(UsersGroupMember.query().all(), []) + + def test_additonal_email_as_main(self): + usr = UserModel().create_or_update(username=u'test_user', + password=u'qweqwe', + email=u'main_email@rhodecode.org', + firstname=u'u1', lastname=u'u1') + Session().commit() + + def do(): + m = UserEmailMap() + m.email = u'main_email@rhodecode.org' + m.user = usr + Session().add(m) + Session().commit() + self.assertRaises(AttributeError, do) + + UserModel().delete(usr.user_id) + Session().commit() + + def test_extra_email_map(self): + usr = UserModel().create_or_update(username=u'test_user', + password=u'qweqwe', + email=u'main_email@rhodecode.org', + firstname=u'u1', lastname=u'u1') + Session().commit() + + m = UserEmailMap() + m.email = u'main_email2@rhodecode.org' + m.user = usr + Session().add(m) + Session().commit() + + u = User.get_by_email(email='main_email@rhodecode.org') + self.assertEqual(usr.user_id, u.user_id) + self.assertEqual(usr.username, u.username) + + u = User.get_by_email(email='main_email2@rhodecode.org') + self.assertEqual(usr.user_id, u.user_id) + self.assertEqual(usr.username, u.username) + u = User.get_by_email(email='main_email3@rhodecode.org') + self.assertEqual(None, u) + + UserModel().delete(usr.user_id) + Session().commit() + + +class TestUsers(unittest.TestCase): + + def __init__(self, methodName='runTest'): + super(TestUsers, self).__init__(methodName=methodName) + + def setUp(self): + self.u1 = UserModel().create_or_update(username=u'u1', + password=u'qweqwe', + email=u'u1@rhodecode.org', + firstname=u'u1', lastname=u'u1') + + def tearDown(self): + perm = Permission.query().all() + for p in perm: + UserModel().revoke_perm(self.u1, p) + + UserModel().delete(self.u1) + Session().commit() + + def test_add_perm(self): + perm = Permission.query().all()[0] + UserModel().grant_perm(self.u1, perm) + Session().commit() + self.assertEqual(UserModel().has_perm(self.u1, perm), True) + + def test_has_perm(self): + perm = Permission.query().all() + for p in perm: + has_p = UserModel().has_perm(self.u1, p) + self.assertEqual(False, has_p) + + def test_revoke_perm(self): + perm = Permission.query().all()[0] + UserModel().grant_perm(self.u1, perm) + Session().commit() + self.assertEqual(UserModel().has_perm(self.u1, perm), True) + + #revoke + UserModel().revoke_perm(self.u1, perm) + Session().commit() + self.assertEqual(UserModel().has_perm(self.u1, perm), False) diff --git a/rhodecode/tests/mem_watch b/rhodecode/tests/scripts/mem_watch rename from rhodecode/tests/mem_watch rename to rhodecode/tests/scripts/mem_watch diff --git a/rhodecode/tests/_test_concurency.py b/rhodecode/tests/scripts/test_concurency.py rename from rhodecode/tests/_test_concurency.py rename to rhodecode/tests/scripts/test_concurency.py --- a/rhodecode/tests/_test_concurency.py +++ b/rhodecode/tests/scripts/test_concurency.py @@ -79,6 +79,7 @@ class Command(object): print stdout, stderr return stdout, stderr + def get_session(): engine = engine_from_config(conf, 'sqlalchemy.db1.') init_model(engine) @@ -124,7 +125,6 @@ def create_test_repo(force=True): if user is None: raise Exception('user not found') - repo = sa.query(Repository).filter(Repository.repo_name == HG_REPO).scalar() if repo is None: @@ -140,6 +140,7 @@ def create_test_repo(force=True): print 'done' + def set_anonymous_access(enable=True): sa = get_session() user = sa.query(User).filter(User.username == 'default').one() @@ -147,6 +148,7 @@ def set_anonymous_access(enable=True): sa.add(user) sa.commit() + def get_anonymous_access(): sa = get_session() return sa.query(User).filter(User.username == 'default').one().active diff --git a/rhodecode/tests/rhodecode_crawler.py b/rhodecode/tests/scripts/test_crawler.py rename from rhodecode/tests/rhodecode_crawler.py rename to rhodecode/tests/scripts/test_crawler.py diff --git a/rhodecode/tests/test_hg_operations.py b/rhodecode/tests/scripts/test_scm_operations.py rename from rhodecode/tests/test_hg_operations.py rename to rhodecode/tests/scripts/test_scm_operations.py --- a/rhodecode/tests/test_hg_operations.py +++ b/rhodecode/tests/scripts/test_scm_operations.py @@ -64,7 +64,8 @@ log = logging.getLogger(__name__) engine = engine_from_config(conf, 'sqlalchemy.db1.') init_model(engine) -sa = meta.Session +sa = meta.Session() + class Command(object): @@ -137,7 +138,6 @@ def create_test_repo(force=True): if user is None: raise Exception('user not found') - repo = sa.query(Repository).filter(Repository.repo_name == HG_REPO).scalar() if repo is None: @@ -161,6 +161,7 @@ def set_anonymous_access(enable=True): if enable != User.get_by_username('default').active: raise Exception('Cannot set anonymous access') + def get_anonymous_access(): user = User.get_by_username('default') return user.active @@ -235,6 +236,7 @@ def test_clone_anonymous(): print '\tdisabling anonymous access' set_anonymous_access(enable=False) + @test_wrapp def test_clone_wrong_credentials(): cwd = path = jn(TESTS_TMP_PATH, HG_REPO) @@ -264,10 +266,12 @@ def test_clone_wrong_credentials(): if not """abort: authorization failed""" in stderr: raise Exception('Failure') + @test_wrapp def test_pull(): pass + @test_wrapp def test_push_modify_file(f_name='setup.py'): cwd = path = jn(TESTS_TMP_PATH, HG_REPO) @@ -281,6 +285,7 @@ def test_push_modify_file(f_name='setup. Command(cwd).execute('hg push %s' % jn(TESTS_TMP_PATH, HG_REPO)) + @test_wrapp def test_push_new_file(commits=15, with_clone=True): @@ -312,6 +317,7 @@ def test_push_new_file(commits=15, with_ Command(cwd).execute('hg push --verbose --debug %s' % push_url) + @test_wrapp def test_push_wrong_credentials(): cwd = path = jn(TESTS_TMP_PATH, HG_REPO) @@ -332,6 +338,7 @@ def test_push_wrong_credentials(): Command(cwd).execute('hg push %s' % clone_url) + @test_wrapp def test_push_wrong_path(): cwd = path = jn(TESTS_TMP_PATH, HG_REPO) @@ -366,10 +373,12 @@ def test_push_wrong_path(): if not """abort: HTTP Error 403: Forbidden""" in stderr: raise Exception('Failure') + @test_wrapp def get_logs(): return UserLog.query().all() + @test_wrapp def test_logs(initial): logs = UserLog.query().all() diff --git a/rhodecode/tests/vcs/__init__.py b/rhodecode/tests/vcs/__init__.py --- a/rhodecode/tests/vcs/__init__.py +++ b/rhodecode/tests/vcs/__init__.py @@ -22,8 +22,8 @@ function at ``tests/__init__.py``. import os from rhodecode.lib import vcs from rhodecode.lib.vcs.utils.compat import unittest +from utils import VCSTestError, SCMFetcher from rhodecode.tests import * -from utils import VCSTestError, SCMFetcher def setup_package():