# HG changeset patch # User Marc Abramowitz # Date 1428509938 25200 # Node ID 7b7d5029c81fe18f892024c96daac447cb2a1576 # Parent 177ccc998b040a5c3aedb793b73873a9ea156270 tests: PEP8ify test_user_groups.py This eliminates flake8 warnings: kallithea/tests/models/test_user_groups.py:3:1: F403 'from kallithea.tests import *' used; unable to detect undefined names kallithea/tests/models/test_user_groups.py:22:5: E303 too many blank lines (2) diff -r 177ccc998b04 -r 7b7d5029c81f 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 08 13:48:30 2015 -0700 +++ b/kallithea/tests/models/test_user_group_permissions_on_repo_groups.py Wed Apr 08 09:18:58 2015 -0700 @@ -1,5 +1,4 @@ import functools -from kallithea.tests import * from kallithea.model.repo_group import RepoGroupModel from kallithea.model.db import RepoGroup @@ -168,6 +167,7 @@ for name, perm in items: 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 @@ -192,6 +192,7 @@ old_perm = perm 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 diff -r 177ccc998b04 -r 7b7d5029c81f kallithea/tests/models/test_user_groups.py --- a/kallithea/tests/models/test_user_groups.py Wed Apr 08 13:48:30 2015 -0700 +++ b/kallithea/tests/models/test_user_groups.py Wed Apr 08 09:18:58 2015 -0700 @@ -1,6 +1,6 @@ from kallithea.model.db import User -from kallithea.tests import * +from kallithea.tests import BaseTestCase, parameterized, TEST_USER_REGULAR_LOGIN from kallithea.tests.fixture import Fixture from kallithea.model.user_group import UserGroupModel @@ -18,7 +18,6 @@ fixture.destroy_user_group(gr) Session().commit() - @parameterized.expand([ ([], [], [], [], []), ([], ['regular'], [], [], ['regular']), # no changes of regular diff -r 177ccc998b04 -r 7b7d5029c81f kallithea/tests/models/test_user_permissions_on_repo_groups.py --- a/kallithea/tests/models/test_user_permissions_on_repo_groups.py Wed Apr 08 13:48:30 2015 -0700 +++ b/kallithea/tests/models/test_user_permissions_on_repo_groups.py Wed Apr 08 09:18:58 2015 -0700 @@ -1,5 +1,4 @@ import functools -from kallithea.tests import * from kallithea.model.repo_group import RepoGroupModel from kallithea.model.db import RepoGroup, User @@ -36,6 +35,7 @@ recursive=recursive, check_perms=False) Session().commit() + def setup_module(): global test_u1_id, _get_repo_perms, _get_group_perms test_u1 = _create_project_tree()