Show More
@@ -41,7 +41,7 b' log = logging.getLogger(__name__)' | |||||
41 |
|
41 | |||
42 | __all__ = [ |
|
42 | __all__ = [ | |
43 | 'get_new_dir', 'TestController', |
|
43 | 'get_new_dir', 'TestController', | |
44 |
'link_to', ' |
|
44 | 'link_to', 'clear_all_caches', | |
45 | 'assert_session_flash', 'login_user', 'no_newline_id_generator', |
|
45 | 'assert_session_flash', 'login_user', 'no_newline_id_generator', | |
46 | 'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'SVN_REPO', |
|
46 | 'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'SVN_REPO', | |
47 | 'NEW_HG_REPO', 'NEW_GIT_REPO', |
|
47 | 'NEW_HG_REPO', 'NEW_GIT_REPO', | |
@@ -95,17 +95,6 b" TEST_HG_REPO_PULL = jn(TESTS_TMP_PATH, '" | |||||
95 | TEST_REPO_PREFIX = 'vcs-test' |
|
95 | TEST_REPO_PREFIX = 'vcs-test' | |
96 |
|
96 | |||
97 |
|
97 | |||
98 | # skip ldap tests if LDAP lib is not installed |
|
|||
99 | ldap_lib_installed = False |
|
|||
100 | try: |
|
|||
101 | import ldap |
|
|||
102 | ldap_lib_installed = True |
|
|||
103 | except ImportError: |
|
|||
104 | ldap = None |
|
|||
105 | # means that python-ldap is not installed |
|
|||
106 | pass |
|
|||
107 |
|
||||
108 |
|
||||
109 | def clear_all_caches(): |
|
98 | def clear_all_caches(): | |
110 | from beaker.cache import cache_managers |
|
99 | from beaker.cache import cache_managers | |
111 | for _cache in cache_managers.values(): |
|
100 | for _cache in cache_managers.values(): |
@@ -24,8 +24,7 b' import pytest' | |||||
24 |
|
24 | |||
25 | from rhodecode.tests import ( |
|
25 | from rhodecode.tests import ( | |
26 | HG_REPO, TEST_USER_REGULAR2_EMAIL, TEST_USER_REGULAR2_LOGIN, |
|
26 | HG_REPO, TEST_USER_REGULAR2_EMAIL, TEST_USER_REGULAR2_LOGIN, | |
27 |
TEST_USER_REGULAR2_PASS, TEST_USER_ADMIN_LOGIN, TESTS_TMP_PATH |
|
27 | TEST_USER_REGULAR2_PASS, TEST_USER_ADMIN_LOGIN, TESTS_TMP_PATH) | |
28 | ldap_lib_installed) |
|
|||
29 |
|
28 | |||
30 | from rhodecode.model import validators as v |
|
29 | from rhodecode.model import validators as v | |
31 | from rhodecode.model.user_group import UserGroupModel |
|
30 | from rhodecode.model.user_group import UserGroupModel |
General Comments 0
You need to be logged in to leave comments.
Login now