diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py --- a/rhodecode/__init__.py +++ b/rhodecode/__init__.py @@ -24,7 +24,7 @@ versioning implementation: http://semver @author: marcink """ -VERSION = (1, 0, 0, 'rc4') +VERSION = (1, 0, 0,) __version__ = '.'.join((str(each) for each in VERSION[:4])) diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py --- a/rhodecode/lib/utils.py +++ b/rhodecode/lib/utils.py @@ -460,6 +460,7 @@ def create_test_env(repos_test_path, con import tarfile import shutil from os.path import dirname as dn, join as jn, abspath + from rhodecode.tests import REPO_PATH, NEW_REPO_PATH log = logging.getLogger('TestEnvCreator') # create logger @@ -493,8 +494,12 @@ def create_test_env(repos_test_path, con #PART TWO make test repo log.debug('making test vcs repo') - if os.path.isdir('/tmp/vcs_test'): - shutil.rmtree('/tmp/vcs_test') + if os.path.isdir(REPO_PATH): + log.debug('REMOVING %s', REPO_PATH) + shutil.rmtree(REPO_PATH) + if os.path.isdir(NEW_REPO_PATH): + log.debug('REMOVING %s', NEW_REPO_PATH) + shutil.rmtree(NEW_REPO_PATH) cur_dir = dn(dn(abspath(__file__))) tar = tarfile.open(jn(cur_dir, 'tests', "vcs_test.tar.gz")) diff --git a/rhodecode/templates/search/search_content.html b/rhodecode/templates/search/search_content.html --- a/rhodecode/templates/search/search_content.html +++ b/rhodecode/templates/search/search_content.html @@ -25,7 +25,7 @@ %endif %endfor %if c.cur_query and c.formated_results: -
+
${c.formated_results.pager('$link_previous ~2~ $link_next')}
%endif \ No newline at end of file diff --git a/rhodecode/tests/__init__.py b/rhodecode/tests/__init__.py --- a/rhodecode/tests/__init__.py +++ b/rhodecode/tests/__init__.py @@ -18,8 +18,7 @@ import os from rhodecode.model import meta import logging - -log = logging.getLogger(__name__) +log = logging.getLogger(__name__) import pylons.test @@ -32,6 +31,9 @@ import pylons.test #nosetests rhodecode.tests.functional.test_admin_settings:TestSettingsController.test_my_account environ = {} +TEST_DIR = '/tmp' +REPO_PATH = os.path.join(TEST_DIR, 'vcs_test') +NEW_REPO_PATH = os.path.join(TEST_DIR, 'vcs_test_new') class TestController(TestCase): @@ -43,16 +45,16 @@ class TestController(TestCase): self.sa = meta.Session TestCase.__init__(self, *args, **kwargs) - + def log_user(self, username='test_admin', password='test12'): response = self.app.post(url(controller='login', action='index'), {'username':username, 'password':password}) print response - + if 'invalid user name' in response.body: assert False, 'could not login using %s %s' % (username, password) - + assert response.status == '302 Found', 'Wrong response code from login got %s' % response.status assert response.session['rhodecode_user'].username == username, 'wrong logged in user got %s expected %s' % (response.session['rhodecode_user'].username, username) return response.follow() diff --git a/rhodecode/tests/functional/test_changelog.py b/rhodecode/tests/functional/test_changelog.py --- a/rhodecode/tests/functional/test_changelog.py +++ b/rhodecode/tests/functional/test_changelog.py @@ -5,16 +5,15 @@ class TestChangelogController(TestContro def test_index(self): self.log_user() response = self.app.get(url(controller='changelog', action='index', repo_name='vcs_test')) - - print response - assert """
""" in response.body, 'wrong info about number ofchanges' + + assert """
""" in response.body, 'wrong info about number of changes' assert """Small update at simplevcs app""" in response.body, 'missing info about commit message' assert """0""" in response.body, 'wrong info about removed nodes' assert """2""" in response.body, 'wrong info about changed nodes' assert """1""" in response.body, 'wrong info about added nodes' - + #pagination - + response = self.app.get(url(controller='changelog', action='index', repo_name='vcs_test'), {'page':1}) response = self.app.get(url(controller='changelog', action='index', repo_name='vcs_test'), {'page':2}) response = self.app.get(url(controller='changelog', action='index', repo_name='vcs_test'), {'page':3}) @@ -27,5 +26,5 @@ class TestChangelogController(TestContro assert """1"""in response.body, 'wrong info about number of changes' assert """0"""in response.body, 'wrong info about number of added' assert """
commit 64: 46ad32a4f974@2010-04-20 00:33:21
"""in response.body, 'wrong info about commit 64' + assert """
Merge with 2e6a2bf9356ca56df08807f4ad86d480da72a8f4
"""in response.body, 'wrong info about commit 64 is a merge' - diff --git a/setup.cfg b/setup.cfg --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [egg_info] -tag_build = rc4 +tag_build = tag_svn_revision = true [easy_install] diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -4,18 +4,18 @@ py_version = sys.version_info requirements = [ "Pylons>=1.0.0", - "SQLAlchemy>=0.6", + "SQLAlchemy==0.6.4", "Mako>=0.3.2", "vcs==0.1.8", "pygments>=1.3.0", - "mercurial>=1.6", - "whoosh==1.0.0", - "celery>=2.0.0", + "mercurial==1.6.4", + "whoosh==1.2.5", + "celery==2.1.2", "py-bcrypt", "babel", ] -classifiers = ['Development Status :: 4 - Beta', +classifiers = ["Development Status :: 5 - Production/Stable", 'Environment :: Web Environment', 'Framework :: Pylons', 'Intended Audience :: Developers',