dependencies: dropped nose dependency.

requirements.txt

@@ -1,137 +1,136 b''
 ## core
 setuptools==30.1.0
 setuptools-scm==1.15.0
 
 amqplib==1.0.2
 anyjson==0.3.3
 authomatic==0.1.0.post1
 Babel==1.3
 Beaker==1.9.0
 celery==2.2.10
 Chameleon==2.24
 channelstream==0.5.2
 click==5.1
 colander==1.3.3
 configobj==5.0.6
 cssselect==1.0.1
 decorator==4.0.11
 deform==2.0.4
 docutils==0.13.1
 dogpile.cache==0.6.4
 dogpile.core==0.4.1
 ecdsa==0.13
 FormEncode==1.2.4
 future==0.14.3
 futures==3.0.2
 gnureadline==6.3.3
 infrae.cache==1.0.1
 iso8601==0.1.11
 itsdangerous==0.24
 Jinja2==2.7.3
 kombu==1.5.1
 lxml==3.7.3
 Mako==1.0.7
 Markdown==2.6.8
 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
 PasteDeploy==1.5.2
 PasteScript==1.7.5
 pathlib2==2.3.0
 peppercorn==0.5
 psutil==4.3.1
 psycopg2==2.7.1
 py-bcrypt==0.4
 pycrypto==2.6.1
 pycurl==7.19.5
 pyflakes==0.8.1
 pygments-markdown-lexer==0.1.0.dev39
 Pygments==2.2.0
 pyparsing==1.5.7
 pyramid-beaker==0.8
 pyramid-jinja2==2.5
 pyramid-debugtoolbar==4.3.0
 pyramid-mako==1.0.2
 pyramid==1.9.1
 pysqlite==2.8.3
 python-dateutil==2.1
 python-ldap==2.4.40
 python-memcached==1.58
 python-pam==1.8.2
 pytz==2015.4
 pyzmq==14.6.0
 recaptcha-client==1.0.6
 redis==2.10.6
 repoze.lru==0.6
 requests==2.9.1
 Routes==1.13
 setproctitle==1.1.8
 simplejson==3.11.1
 six==1.9.0
 SQLAlchemy==1.1.11
 sshpubkeys==2.2.0
 subprocess32==3.2.7
 supervisor==3.3.3
 Tempita==0.5.2
 translationstring==1.3
 trollius==1.0.4
 urllib3==1.16
 URLObject==2.4.0
 venusian==1.1.0
 WebError==0.10.3
 WebHelpers2==2.0
 WebHelpers==1.3
 WebOb==1.7.3
 Whoosh==2.7.4
 wsgiref==0.1.2
 zope.cachedescriptors==4.0.0
 zope.deprecation==4.1.2
 zope.event==4.0.3
 zope.interface==4.1.3
 
 ## customized/patched libs
 # our patched version of Pylons==1.0.2
 https://code.rhodecode.com/upstream/pylons/archive/707354ee4261b9c10450404fc9852ccea4fd667d.tar.gz?md5=f26633726fa2cd3a340316ee6a5d218f#egg=Pylons==1.0.2.rhodecode-patch-1
 # not released py-gfm==0.1.3
 https://code.rhodecode.com/upstream/py-gfm/archive/0d66a19bc16e3d49de273c0f797d4e4781e8c0f2.tar.gz?md5=0d0d5385bfb629eea636a80b9c2bfd16#egg=py-gfm==0.1.3.rhodecode-upstream1
 
 # IPYTHON RENDERING
 # entrypoints backport, pypi version doesn't support egg installs
 https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313#egg=entrypoints==0.2.2.rhodecode-upstream1
 nbconvert==5.1.1
 bleach==1.5.0
 nbformat==4.3.0
 jupyter_client==5.0.0
 
 ## cli tools
 alembic==0.9.2
 invoke==0.13.0
 bumpversion==0.5.3
 transifex-client==0.10
 
 ## http servers
 gevent==1.2.2
 greenlet==0.4.12
 gunicorn==19.7.1
 waitress==1.0.2
 uWSGI==2.0.15
 
 ## debug
 ipdb==0.10.3
 ipython==5.1.0
 CProfileV==1.0.7
 bottle==0.12.8
 
 ## rhodecode-tools, special case
 https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.13.0.tar.gz?md5=f937b0cb34d0779103895a5ec5689ee4#egg=rhodecode-tools==0.13.0
 
 ## appenlight
 appenlight-client==0.6.21
 
 ## test related requirements
 -r requirements_test.txt

rhodecode/apps/search/tests/test_search.py

@@ -1,202 +1,202 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2017 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import os
 
 import mock
 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
 
 
 def route_path(name, **kwargs):
     from rhodecode.apps._base import ADMIN_PREFIX
     return {
         'search':
             ADMIN_PREFIX + '/search',
         'search_repo':
             '/{repo_name}/search',
 
     }[name].format(**kwargs)
 
 
 class TestSearchController(TestController):
 
     def test_index(self):
         self.log_user()
         response = self.app.get(route_path('search'))
         assert_response = AssertResponse(response)
         assert_response.one_element_exists('input#q')
 
     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'),
                                     {'q': HG_REPO})
             response.mustcontain('There is no index to search in. '
                                  'Please run whoosh indexer')
 
     def test_search_validation(self):
         self.log_user()
         response = self.app.get(route_path('search'),
             {'q': query, 'type': 'content', 'page_limit': 1000})
 
         response.mustcontain(
             'page_limit - 1000 is greater than maximum value 500')
 
     @pytest.mark.parametrize("query, expected_hits, expected_paths", [
         ('todo', 23, [
             'vcs/backends/hg/inmemory.py',
             'vcs/tests/test_git.py']),
         ('extension:rst installation', 6, [
             'docs/index.rst',
             'docs/installation.rst']),
         ('def repo', 87, [
             'vcs/tests/test_git.py',
             'vcs/tests/test_changesets.py']),
         ('repository:%s def test' % HG_REPO, 18, [
             'vcs/tests/test_git.py',
             'vcs/tests/test_changesets.py']),
         ('"def main"', 9, [
             'vcs/__init__.py',
             'vcs/tests/__init__.py',
             'vcs/utils/progressbar.py']),
         ('owner:test_admin', 358, [
             'vcs/tests/base.py',
             'MANIFEST.in',
             'vcs/utils/termcolors.py',
             'docs/theme/ADC/static/documentation.png']),
         ('owner:test_admin def main', 72, [
             'vcs/__init__.py',
             'vcs/tests/test_utils_filesize.py',
             'vcs/tests/test_cli.py']),
         ('owner:michał test', 0, []),
     ])
     def test_search_files(self, query, expected_hits, expected_paths):
         self.log_user()
         response = self.app.get(route_path('search'),
             {'q': query, 'type': 'content', 'page_limit': 500})
 
         response.mustcontain('%s results' % expected_hits)
         for path in expected_paths:
             response.mustcontain(path)
 
     @pytest.mark.parametrize("query, expected_hits, expected_commits", [
         ('bother to ask where to fetch repo during tests', 3, [
             ('hg', 'a00c1b6f5d7a6ae678fd553a8b81d92367f7ecf1'),
             ('git', 'c6eb379775c578a95dad8ddab53f963b80894850'),
             ('svn', '98')]),
         ('michał', 0, []),
         ('changed:tests/utils.py', 36, [
             ('hg', 'a00c1b6f5d7a6ae678fd553a8b81d92367f7ecf1')]),
         ('changed:vcs/utils/archivers.py', 11, [
             ('hg', '25213a5fbb048dff8ba65d21e466a835536e5b70'),
             ('hg', '47aedd538bf616eedcb0e7d630ea476df0e159c7'),
             ('hg', 'f5d23247fad4856a1dabd5838afade1e0eed24fb'),
             ('hg', '04ad456aefd6461aea24f90b63954b6b1ce07b3e'),
             ('git', 'c994f0de03b2a0aa848a04fc2c0d7e737dba31fc'),
             ('git', 'd1f898326327e20524fe22417c22d71064fe54a1'),
             ('git', 'fe568b4081755c12abf6ba673ba777fc02a415f3'),
             ('git', 'bafe786f0d8c2ff7da5c1dcfcfa577de0b5e92f1')]),
         ('added:README.rst', 3, [
             ('hg', '3803844fdbd3b711175fc3da9bdacfcd6d29a6fb'),
             ('git', 'ff7ca51e58c505fec0dd2491de52c622bb7a806b'),
             ('svn', '8')]),
         ('changed:lazy.py', 15, [
             ('hg', 'eaa291c5e6ae6126a203059de9854ccf7b5baa12'),
             ('git', '17438a11f72b93f56d0e08e7d1fa79a378578a82'),
             ('svn', '82'),
             ('svn', '262'),
             ('hg', 'f5d23247fad4856a1dabd5838afade1e0eed24fb'),
             ('git', '33fa3223355104431402a888fa77a4e9956feb3e')
             ]),
         ('author:[e-mail] '
          'commit_id:b986218ba1c9b0d6a259fac9b050b1724ed8e545', 1, [
              ('hg', 'b986218ba1c9b0d6a259fac9b050b1724ed8e545')]),
         ('b986218ba1c9b0d6a259fac9b050b1724ed8e545', 1, [
              ('hg', 'b986218ba1c9b0d6a259fac9b050b1724ed8e545')]),
         ('b986218b', 1, [
              ('hg', 'b986218ba1c9b0d6a259fac9b050b1724ed8e545')]),
     ])
     def test_search_commit_messages(
             self, query, expected_hits, expected_commits, enabled_backends):
         self.log_user()
         response = self.app.get(route_path('search'),
             {'q': query, 'type': 'commit', 'page_limit': 500})
 
         response.mustcontain('%s results' % expected_hits)
         for backend, commit_id in expected_commits:
             if backend in enabled_backends:
                 response.mustcontain(commit_id)
 
     @pytest.mark.parametrize("query, expected_hits, expected_paths", [
         ('readme.rst', 3, []),
         ('test*', 75, []),
         ('*model*', 1, []),
         ('extension:rst', 48, []),
         ('extension:rst api', 24, []),
     ])
     def test_search_file_paths(self, query, expected_hits, expected_paths):
         self.log_user()
         response = self.app.get(route_path('search'),
             {'q': query, 'type': 'path', 'page_limit': 500})
 
         response.mustcontain('%s results' % expected_hits)
         for path in expected_paths:
             response.mustcontain(path)
 
     def test_search_commit_message_specific_repo(self, backend):
         self.log_user()
         response = self.app.get(
             route_path('search_repo',repo_name=backend.repo_name),
             {'q': 'bother to ask where to fetch repo during tests',
              'type': 'commit'})
 
         response.mustcontain('1 results')
 
     def test_filters_are_not_applied_for_admin_user(self):
         self.log_user()
         with mock.patch('whoosh.searching.Searcher.search') as search_mock:
             self.app.get(route_path('search'),
                 {'q': 'test query', 'type': 'commit'})
         assert search_mock.call_count == 1
         _, kwargs = search_mock.call_args
         assert kwargs['filter'] is None
 
     def test_filters_are_applied_for_normal_user(self, enabled_backends):
         self.log_user(TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
         with mock.patch('whoosh.searching.Searcher.search') as search_mock:
             self.app.get(route_path('search'),
                 {'q': 'test query', 'type': 'commit'})
         assert search_mock.call_count == 1
         _, kwargs = search_mock.call_args
         assert isinstance(kwargs['filter'], query.Or)
         expected_repositories = [
             'vcs_test_{}'.format(b) for b in enabled_backends]
         queried_repositories = [
             name for type_, name in kwargs['filter'].all_terms()]
         for repository in expected_repositories:
             assert repository in queried_repositories

rhodecode/tests/__init__.py

@@ -1,248 +1,247 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2017 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import os
 import time
 import logging
 import datetime
 import hashlib
 import tempfile
 from os.path import join as jn
 
 from tempfile import _RandomNameSequence
 
 from pylons import url
 
-from nose.plugins.skip import SkipTest
 import pytest
 
 from rhodecode.model.db import User
 from rhodecode.lib import auth
 from rhodecode.lib import helpers as h
 from rhodecode.lib.helpers import flash, link_to
 from rhodecode.lib.utils2 import safe_str
 
 
 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',
     'NEW_HG_REPO', 'NEW_GIT_REPO',
     'HG_FORK', 'GIT_FORK', 'TEST_USER_ADMIN_LOGIN', 'TEST_USER_ADMIN_PASS',
     'TEST_USER_REGULAR_LOGIN', 'TEST_USER_REGULAR_PASS',
     'TEST_USER_REGULAR_EMAIL', 'TEST_USER_REGULAR2_LOGIN',
     'TEST_USER_REGULAR2_PASS', 'TEST_USER_REGULAR2_EMAIL', 'TEST_HG_REPO',
     'TEST_HG_REPO_CLONE', 'TEST_HG_REPO_PULL', 'TEST_GIT_REPO',
     'TEST_GIT_REPO_CLONE', 'TEST_GIT_REPO_PULL', 'SCM_TESTS',
 ]
 
 # Invoke websetup with the current config file
 # SetupCommand('setup-app').run([config_file])
 
 # SOME GLOBALS FOR TESTS
 TEST_DIR = tempfile.gettempdir()
 
 TESTS_TMP_PATH = jn(TEST_DIR, 'rc_test_%s' % _RandomNameSequence().next())
 TEST_USER_ADMIN_LOGIN = 'test_admin'
 TEST_USER_ADMIN_PASS = 'test12'
 TEST_USER_ADMIN_EMAIL = '[e-mail]'
 
 TEST_USER_REGULAR_LOGIN = 'test_regular'
 TEST_USER_REGULAR_PASS = 'test12'
 TEST_USER_REGULAR_EMAIL = '[e-mail]'
 
 TEST_USER_REGULAR2_LOGIN = 'test_regular2'
 TEST_USER_REGULAR2_PASS = 'test12'
 TEST_USER_REGULAR2_EMAIL = '[e-mail]'
 
 HG_REPO = 'vcs_test_hg'
 GIT_REPO = 'vcs_test_git'
 SVN_REPO = 'vcs_test_svn'
 
 NEW_HG_REPO = 'vcs_test_hg_new'
 NEW_GIT_REPO = 'vcs_test_git_new'
 
 HG_FORK = 'vcs_test_hg_fork'
 GIT_FORK = 'vcs_test_git_fork'
 
 ## VCS
 SCM_TESTS = ['hg', 'git']
 uniq_suffix = str(int(time.mktime(datetime.datetime.now().timetuple())))
 
 TEST_GIT_REPO = jn(TESTS_TMP_PATH, GIT_REPO)
 TEST_GIT_REPO_CLONE = jn(TESTS_TMP_PATH, 'vcsgitclone%s' % uniq_suffix)
 TEST_GIT_REPO_PULL = jn(TESTS_TMP_PATH, 'vcsgitpull%s' % uniq_suffix)
 
 TEST_HG_REPO = jn(TESTS_TMP_PATH, HG_REPO)
 TEST_HG_REPO_CLONE = jn(TESTS_TMP_PATH, 'vcshgclone%s' % uniq_suffix)
 TEST_HG_REPO_PULL = jn(TESTS_TMP_PATH, 'vcshgpull%s' % uniq_suffix)
 
 TEST_REPO_PREFIX = 'vcs-test'
 
 
 # skip ldap tests if LDAP lib is not installed
 ldap_lib_installed = False
 try:
     import ldap
     ldap_lib_installed = True
 except ImportError:
     ldap = None
     # means that python-ldap is not installed
     pass
 
 
 def clear_all_caches():
     from beaker.cache import cache_managers
     for _cache in cache_managers.values():
         _cache.clear()
 
 
 def get_new_dir(title):
     """
     Returns always new directory path.
     """
     from rhodecode.tests.vcs.utils import get_normalized_path
     name_parts = [TEST_REPO_PREFIX]
     if title:
         name_parts.append(title)
     hex_str = hashlib.sha1('%s %s' % (os.getpid(), time.time())).hexdigest()
     name_parts.append(hex_str)
     name = '-'.join(name_parts)
     path = os.path.join(TEST_DIR, name)
     return get_normalized_path(path)
 
 
 @pytest.mark.usefixtures('app', 'index_location')
 class TestController(object):
 
     maxDiff = None
 
     def log_user(self, username=TEST_USER_ADMIN_LOGIN,
                  password=TEST_USER_ADMIN_PASS):
         self._logged_username = username
         self._session = login_user_session(self.app, username, password)
         self.csrf_token = auth.get_csrf_token(self._session)
 
         return self._session['rhodecode_user']
 
     def logout_user(self):
         logout_user_session(self.app, auth.get_csrf_token(self._session))
         self.csrf_token = None
         self._logged_username = None
         self._session = None
 
     def _get_logged_user(self):
         return User.get_by_username(self._logged_username)
 
 
 def login_user_session(
         app, username=TEST_USER_ADMIN_LOGIN, password=TEST_USER_ADMIN_PASS):
 
     response = app.post(
         h.route_path('login'),
         {'username': username, 'password': password})
     if 'invalid user name' in response.body:
         pytest.fail('could not login using %s %s' % (username, password))
 
     assert response.status == '302 Found'
     response = response.follow()
     assert response.status == '200 OK'
 
     session = response.get_session_from_response()
     assert 'rhodecode_user' in session
     rc_user = session['rhodecode_user']
     assert rc_user.get('username') == username
     assert rc_user.get('is_authenticated')
 
     return session
 
 
 def logout_user_session(app, csrf_token):
     app.post(h.route_path('logout'), {'csrf_token': csrf_token}, status=302)
 
 
 def login_user(app, username=TEST_USER_ADMIN_LOGIN,
                password=TEST_USER_ADMIN_PASS):
     return login_user_session(app, username, password)['rhodecode_user']
 
 
 def assert_session_flash(response, msg=None, category=None, no_=None):
     """
     Assert on a flash message in the current session.
 
     :param response: Response from give calll, it will contain flash
         messages or bound session with them.
     :param msg: The expected message. Will be evaluated if a
         :class:`LazyString` is passed in.
     :param category: Optional. If passed, the message category will be
         checked as well.
     :param no_: Optional. If passed, the message will be checked to NOT
         be in the flash session
     """
     if msg is None and no_ is None:
         raise ValueError("Parameter msg or no_ is required.")
 
     if msg and no_:
         raise ValueError("Please specify either msg or no_, but not both")
 
     session = response.get_session_from_response()
     messages = flash.pop_messages(session=session)
     msg = _eval_if_lazy(msg)
 
     assert messages, 'unable to find message `%s` in empty flash list' % msg
     message = messages[0]
 
     message_text = _eval_if_lazy(message.message) or ''
 
     if no_:
         if no_ in message_text:
             msg = u'msg `%s` found in session flash.' % (no_,)
             pytest.fail(safe_str(msg))
     else:
         if msg not in message_text:
             fail_msg = u'msg `%s` not found in session ' \
                        u'flash: got `%s` (type:%s) instead' % (
                 msg, message_text, type(message_text))
 
             pytest.fail(safe_str(fail_msg))
         if category:
             assert category == message.category
 
 
 def _eval_if_lazy(value):
     return value.eval() if hasattr(value, 'eval') else value
 
 
 def no_newline_id_generator(test_name):
     """
     Generates a test name without spaces or newlines characters. Used for
     nicer output of progress of test
     """
     org_name = test_name
     test_name = test_name\
         .replace('\n', '_N') \
         .replace('\r', '_N') \
         .replace('\t', '_T') \
         .replace(' ', '_S')
 
     return test_name or 'test-with-empty-name'