# HG changeset patch # User Marc Abramowitz # Date 1429135251 25200 # Node ID b658d5b3d1497ec519992ad4ceb73992837eafe4 # Parent cf8c3cf122a09c712be6725a9585c2169d6a118d tests: Eliminate use of nose.tools.with_setup - it is nose-specific Instead, simply make `permissions_setup_func` set the baseline permissions. diff -r cf8c3cf122a0 -r b658d5b3d149 kallithea/tests/models/test_user_group_permissions_on_repo_groups.py --- a/kallithea/tests/models/test_user_group_permissions_on_repo_groups.py Wed Apr 15 14:58:12 2015 -0700 +++ b/kallithea/tests/models/test_user_group_permissions_on_repo_groups.py Wed Apr 15 15:00:51 2015 -0700 @@ -4,7 +4,6 @@ from kallithea.model.db import RepoGroup from kallithea.model.meta import Session -from nose.tools import with_setup from kallithea.tests.models.common import _create_project_tree, check_tree_perms, \ _get_perms, _check_expected_count, expected_count, _destroy_project_tree from kallithea.model.user_group import UserGroupModel @@ -25,6 +24,13 @@ repo_group = RepoGroup.get_by_group_name(group_name=group_name) if not repo_group: raise Exception('Cannot get group %s' % group_name) + + # Start with a baseline that current group can read recursive + perms_updates = [[test_u2_gr_id, 'group.read', 'users_group']] + RepoGroupModel()._update_permissions(repo_group, + perms_updates=perms_updates, + recursive='all', check_perms=False) + perms_updates = [[test_u2_gr_id, perm, 'users_group']] RepoGroupModel()._update_permissions(repo_group, perms_updates=perms_updates, @@ -54,7 +60,6 @@ _destroy_project_tree(test_u2_id) -@with_setup(permissions_setup_func) def test_user_permissions_on_group_without_recursive_mode(): # set permission to g0 non-recursive mode recursive = 'none' @@ -74,7 +79,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_without_recursive_mode_subgroup(): # set permission to g0 non-recursive mode recursive = 'none' @@ -94,7 +98,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_mode(): # set permission to g0 recursive mode, all children including @@ -114,7 +117,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_mode_inner_group(): ## set permission to g0_3 group to none recursive = 'all' @@ -132,7 +134,6 @@ yield check_tree_perms, name, perm, group, 'group.none' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_mode_deepest(): ## set permission to g0_3 group to none recursive = 'all' @@ -150,7 +151,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_mode_only_with_repos(): ## set permission to g0_3 group to none recursive = 'all' @@ -168,7 +168,6 @@ yield check_tree_perms, name, perm, group, 'group.admin' -@with_setup(permissions_setup_func) 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' @@ -193,7 +192,6 @@ yield check_tree_perms, name, perm, group, old_perm -@with_setup(permissions_setup_func) 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' diff -r cf8c3cf122a0 -r b658d5b3d149 kallithea/tests/models/test_user_permissions_on_repo_groups.py --- a/kallithea/tests/models/test_user_permissions_on_repo_groups.py Wed Apr 15 14:58:12 2015 -0700 +++ b/kallithea/tests/models/test_user_permissions_on_repo_groups.py Wed Apr 15 15:00:51 2015 -0700 @@ -4,7 +4,6 @@ from kallithea.model.db import RepoGroup, User from kallithea.model.meta import Session -from nose.tools import with_setup from kallithea.tests.models.common import _create_project_tree, check_tree_perms, \ _get_perms, _check_expected_count, expected_count, _destroy_project_tree @@ -21,7 +20,6 @@ """ if not user_id: user_id = test_u1_id - # called by the @with_setup decorator also reset the default user stuff permissions_setup_func(group_name, perm, recursive, user_id=User.get_default_user().user_id) @@ -29,6 +27,12 @@ if not repo_group: raise Exception('Cannot get group %s' % group_name) + # Start with a baseline that current group can read recursive + perms_updates = [[user_id, 'group.read', 'user']] + RepoGroupModel()._update_permissions(repo_group, + perms_updates=perms_updates, + recursive='all', check_perms=False) + perms_updates = [[user_id, perm, 'user']] RepoGroupModel()._update_permissions(repo_group, perms_updates=perms_updates, @@ -51,7 +55,6 @@ _destroy_project_tree(test_u1_id) -@with_setup(permissions_setup_func) def test_user_permissions_on_group_without_recursive_mode(): # set permission to g0 non-recursive mode recursive = 'none' @@ -71,7 +74,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_without_recursive_mode_subgroup(): # set permission to g0 non-recursive mode recursive = 'none' @@ -91,7 +93,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_mode(): # set permission to g0 recursive mode, all children including @@ -111,7 +112,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_mode_for_default_user(): # set permission to g0 recursive mode, all children including @@ -139,7 +139,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_mode_inner_group(): ## set permission to g0_3 group to none recursive = 'all' @@ -157,7 +156,6 @@ yield check_tree_perms, name, perm, group, 'group.none' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_mode_deepest(): ## set permission to g0_3 group to none recursive = 'all' @@ -175,7 +173,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_mode_only_with_repos(): ## set permission to g0_3 group to none recursive = 'all' @@ -193,7 +190,6 @@ yield check_tree_perms, name, perm, group, 'group.admin' -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_repo_mode_for_default_user(): # 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! @@ -228,7 +224,6 @@ yield check_tree_perms, name, perm, group, old_perm -@with_setup(permissions_setup_func) 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' @@ -253,7 +248,6 @@ yield check_tree_perms, name, perm, group, old_perm -@with_setup(permissions_setup_func) def test_user_permissions_on_group_with_recursive_group_mode_for_default_user(): # set permission to g0/g0_1 with recursive groups only mode, all children including # other groups should have this permission now set. repositories should @@ -281,7 +275,6 @@ yield check_tree_perms, name, perm, group, 'group.write' -@with_setup(permissions_setup_func) 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'