Show More
@@ -36,7 +36,6 b' MarkupSafe==0.23' | |||||
36 | meld3==1.0.2 |
|
36 | meld3==1.0.2 | |
37 | msgpack-python==0.4.8 |
|
37 | msgpack-python==0.4.8 | |
38 | MySQL-python==1.2.5 |
|
38 | MySQL-python==1.2.5 | |
39 | nose==1.3.6 |
|
|||
40 | objgraph==3.1.0 |
|
39 | objgraph==3.1.0 | |
41 | packaging==15.2 |
|
40 | packaging==15.2 | |
42 | Paste==2.0.3 |
|
41 | Paste==2.0.3 |
@@ -25,7 +25,7 b' import pytest' | |||||
25 | from whoosh import query |
|
25 | from whoosh import query | |
26 |
|
26 | |||
27 | from rhodecode.tests import ( |
|
27 | from rhodecode.tests import ( | |
28 |
TestController, |
|
28 | TestController, HG_REPO, | |
29 | TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS) |
|
29 | TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS) | |
30 | from rhodecode.tests.utils import AssertResponse |
|
30 | from rhodecode.tests.utils import AssertResponse | |
31 |
|
31 | |||
@@ -51,7 +51,7 b' class TestSearchController(TestControlle' | |||||
51 |
|
51 | |||
52 | def test_search_files_empty_search(self): |
|
52 | def test_search_files_empty_search(self): | |
53 | if os.path.isdir(self.index_location): |
|
53 | if os.path.isdir(self.index_location): | |
54 |
|
|
54 | pytest.skip('skipped due to existing index') | |
55 | else: |
|
55 | else: | |
56 | self.log_user() |
|
56 | self.log_user() | |
57 | response = self.app.get(route_path('search'), |
|
57 | response = self.app.get(route_path('search'), |
@@ -30,7 +30,6 b' from tempfile import _RandomNameSequence' | |||||
30 |
|
30 | |||
31 | from pylons import url |
|
31 | from pylons import url | |
32 |
|
32 | |||
33 | from nose.plugins.skip import SkipTest |
|
|||
34 | import pytest |
|
33 | import pytest | |
35 |
|
34 | |||
36 | from rhodecode.model.db import User |
|
35 | from rhodecode.model.db import User | |
@@ -43,7 +42,7 b' from rhodecode.lib.utils2 import safe_st' | |||||
43 | log = logging.getLogger(__name__) |
|
42 | log = logging.getLogger(__name__) | |
44 |
|
43 | |||
45 | __all__ = [ |
|
44 | __all__ = [ | |
46 |
'get_new_dir', 'TestController', |
|
45 | 'get_new_dir', 'TestController', | |
47 | 'url', 'link_to', 'ldap_lib_installed', 'clear_all_caches', |
|
46 | 'url', 'link_to', 'ldap_lib_installed', 'clear_all_caches', | |
48 | 'assert_session_flash', 'login_user', 'no_newline_id_generator', |
|
47 | 'assert_session_flash', 'login_user', 'no_newline_id_generator', | |
49 | 'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'SVN_REPO', |
|
48 | 'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'SVN_REPO', |
General Comments 0
You need to be logged in to leave comments.
Login now