Mercurial > kallithea
diff rhodecode/tests/__init__.py @ 1723:64e91067b996 beta
- refactoring to overcome poor usage of global pylons config
- db transaction fixes
- fixed tests
- garden
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 26 Nov 2011 02:16:21 +0200 |
parents | f78bee8eec78 |
children | a87aa385f21c |
line wrap: on
line diff
--- a/rhodecode/tests/__init__.py Sat Nov 26 00:11:32 2011 +0200 +++ b/rhodecode/tests/__init__.py Sat Nov 26 02:16:21 2011 +0200 @@ -13,6 +13,7 @@ from os.path import join as jn from unittest import TestCase +from tempfile import _RandomNameSequence from paste.deploy import loadapp from paste.script.appinstall import SetupCommand @@ -20,7 +21,7 @@ from routes.util import URLGenerator from webtest import TestApp -from rhodecode.model import meta +from rhodecode.model.meta import Session from rhodecode.model.db import User import pylons.test @@ -43,7 +44,7 @@ environ = {} #SOME GLOBALS FOR TESTS -from tempfile import _RandomNameSequence + TESTS_TMP_PATH = jn('/', 'tmp', 'rc_test_%s' % _RandomNameSequence().next()) TEST_USER_ADMIN_LOGIN = 'test_admin' TEST_USER_ADMIN_PASS = 'test12' @@ -64,7 +65,7 @@ self.app = TestApp(wsgiapp) url._push_object(URLGenerator(config['routes.map'], environ)) - self.Session = meta.Session + self.Session = Session self.index_location = config['app_conf']['index_dir'] TestCase.__init__(self, *args, **kwargs) @@ -79,14 +80,16 @@ self.fail('could not login using %s %s' % (username, password)) self.assertEqual(response.status, '302 Found') - self.assertEqual(response.session['rhodecode_user'].get('username'), - username) - return response.follow() + ses = response.session['rhodecode_user'] + self.assertEqual(ses.get('username'), username) + response = response.follow() + self.assertEqual(ses.get('is_authenticated'), True) + + return response.session['rhodecode_user'] def _get_logged_user(self): return User.get_by_username(self._logged_username) - def checkSessionFlash(self, response, msg): self.assertTrue('flash' in response.session) self.assertTrue(msg in response.session['flash'][0][1])