# HG changeset patch # User Marcin Kuzminski # Date 1288725545 -3600 # Node ID 45e1fdc0082cfd5cd3efef8f4a5ea7ac00244e21 # Parent ac6f707d19794c438f48b3572c72e79ac699fa4c Version bump,freeze of dependent libs. Little test update diff -r ac6f707d1979 -r 45e1fdc0082c rhodecode/__init__.py --- a/rhodecode/__init__.py Sun Oct 24 16:23:12 2010 +0200 +++ b/rhodecode/__init__.py Tue Nov 02 20:19:05 2010 +0100 @@ -24,7 +24,7 @@ @author: marcink """ -VERSION = (1, 0, 0, 'rc4') +VERSION = (1, 0, 0,) __version__ = '.'.join((str(each) for each in VERSION[:4])) diff -r ac6f707d1979 -r 45e1fdc0082c rhodecode/lib/utils.py --- a/rhodecode/lib/utils.py Sun Oct 24 16:23:12 2010 +0200 +++ b/rhodecode/lib/utils.py Tue Nov 02 20:19:05 2010 +0100 @@ -460,6 +460,7 @@ 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 @@ #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 -r ac6f707d1979 -r 45e1fdc0082c rhodecode/templates/search/search_content.html --- a/rhodecode/templates/search/search_content.html Sun Oct 24 16:23:12 2010 +0200 +++ b/rhodecode/templates/search/search_content.html Tue Nov 02 20:19:05 2010 +0100 @@ -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 -r ac6f707d1979 -r 45e1fdc0082c rhodecode/tests/__init__.py --- a/rhodecode/tests/__init__.py Sun Oct 24 16:23:12 2010 +0200 +++ b/rhodecode/tests/__init__.py Tue Nov 02 20:19:05 2010 +0100 @@ -18,8 +18,7 @@ from rhodecode.model import meta import logging - -log = logging.getLogger(__name__) +log = logging.getLogger(__name__) import pylons.test @@ -32,6 +31,9 @@ #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 @@ 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 -r ac6f707d1979 -r 45e1fdc0082c rhodecode/tests/functional/test_changelog.py --- a/rhodecode/tests/functional/test_changelog.py Sun Oct 24 16:23:12 2010 +0200 +++ b/rhodecode/tests/functional/test_changelog.py Tue Nov 02 20:19:05 2010 +0100 @@ -5,16 +5,15 @@ 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 @@ 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 -r ac6f707d1979 -r 45e1fdc0082c setup.cfg --- a/setup.cfg Sun Oct 24 16:23:12 2010 +0200 +++ b/setup.cfg Tue Nov 02 20:19:05 2010 +0100 @@ -1,5 +1,5 @@ [egg_info] -tag_build = rc4 +tag_build = tag_svn_revision = true [easy_install] diff -r ac6f707d1979 -r 45e1fdc0082c setup.py --- a/setup.py Sun Oct 24 16:23:12 2010 +0200 +++ b/setup.py Tue Nov 02 20:19:05 2010 +0100 @@ -4,18 +4,18 @@ 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',