# HG changeset patch # User Marcin Kuzminski # Date 2017-11-06 21:50:54 # Node ID 607b09b1be5e13073b3076282a6434c577a78ea8 # Parent f8fca99843945b4cbeebebf73d602302db230ec8 dependencies: dropped nose dependency. diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -36,7 +36,6 @@ MarkupSafe==0.23 meld3==1.0.2 msgpack-python==0.4.8 MySQL-python==1.2.5 -nose==1.3.6 objgraph==3.1.0 packaging==15.2 Paste==2.0.3 diff --git a/rhodecode/apps/search/tests/test_search.py b/rhodecode/apps/search/tests/test_search.py --- a/rhodecode/apps/search/tests/test_search.py +++ b/rhodecode/apps/search/tests/test_search.py @@ -25,7 +25,7 @@ import pytest from whoosh import query from rhodecode.tests import ( - TestController, SkipTest, HG_REPO, + TestController, HG_REPO, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS) from rhodecode.tests.utils import AssertResponse @@ -51,7 +51,7 @@ class TestSearchController(TestControlle def test_search_files_empty_search(self): if os.path.isdir(self.index_location): - raise SkipTest('skipped due to existing index') + pytest.skip('skipped due to existing index') else: self.log_user() response = self.app.get(route_path('search'), diff --git a/rhodecode/tests/__init__.py b/rhodecode/tests/__init__.py --- a/rhodecode/tests/__init__.py +++ b/rhodecode/tests/__init__.py @@ -30,7 +30,6 @@ from tempfile import _RandomNameSequence from pylons import url -from nose.plugins.skip import SkipTest import pytest from rhodecode.model.db import User @@ -43,7 +42,7 @@ from rhodecode.lib.utils2 import safe_st log = logging.getLogger(__name__) __all__ = [ - 'get_new_dir', 'TestController', 'SkipTest', + 'get_new_dir', 'TestController', 'url', 'link_to', 'ldap_lib_installed', 'clear_all_caches', 'assert_session_flash', 'login_user', 'no_newline_id_generator', 'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'SVN_REPO',