Mercurial > kallithea
changeset 5000:8b90694580ab
Merge stable to default
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sat, 11 Apr 2015 00:31:14 +0200 |
| parents | 7b7d5029c81f (diff) 6eb57b4f311b (current diff) |
| children | 07dbfabb8fea |
| files | |
| diffstat | 5 files changed, 6 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Fri Apr 10 19:09:40 2015 +0200 +++ b/.hgignore Sat Apr 11 00:31:14 2015 +0200 @@ -6,6 +6,8 @@ *.egg-info *.egg *.mo +.eggs/ +tarballcache/ syntax: regexp ^rcextensions
--- a/kallithea/tests/models/test_user_group_permissions_on_repo_groups.py Fri Apr 10 19:09:40 2015 +0200 +++ b/kallithea/tests/models/test_user_group_permissions_on_repo_groups.py Sat Apr 11 00:31:14 2015 +0200 @@ -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
--- a/kallithea/tests/models/test_user_groups.py Fri Apr 10 19:09:40 2015 +0200 +++ b/kallithea/tests/models/test_user_groups.py Sat Apr 11 00:31:14 2015 +0200 @@ -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
--- a/kallithea/tests/models/test_user_permissions_on_repo_groups.py Fri Apr 10 19:09:40 2015 +0200 +++ b/kallithea/tests/models/test_user_permissions_on_repo_groups.py Sat Apr 11 00:31:14 2015 +0200 @@ -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()
--- a/kallithea/tests/nose_parametrized.py Fri Apr 10 19:09:40 2015 +0200 +++ b/kallithea/tests/nose_parametrized.py Sat Apr 11 00:31:14 2015 +0200 @@ -141,20 +141,6 @@ raise AssertionError("%r in %r" % (needle, haystack)) -def imported_from_test(): - """ Returns true if it looks like this module is being imported by unittest - or nose. """ - import re - import inspect - nose_re = re.compile(r"\bnose\b") - unittest_re = re.compile(r"\bunittest2?\b") - for frame in inspect.stack(): - file = frame[1] - if nose_re.search(file) or unittest_re.search(file): - return True - return False - - def assert_raises(func, exc_type, str_contains=None, repr_contains=None): try: func()