kallithea Changeset - e94f4e54dc03

Changeset - e94f4e54dc03

Parent rev.

Child rev.

[Not reviewed]

default

0 4 1

Marcin Kuzminski - 15 years ago 2010-09-11 03:35:33
marcin@python-works.com

tests fix, put vcs testing tarball

3 files changed:

pylons_app/config/environment.py

pylons_app/tests/__init__.py

pylons_app/tests/functional/test_search.py

0 comments (0 inline, 0 general)

pylons_app/config/environment.py

➞

Show inline comments

@@ @@ -40,28 +40,28 @@ def load_environment(global_conf, app_co @@
     pylons.cache._push_object(config['pylons.app_globals'].cache)
     # Create the Mako TemplateLookup, with the default auto-escaping
     config['pylons.app_globals'].mako_lookup = TemplateLookup(
         directories=paths['templates'],
         error_handler=handle_mako_error,
         module_directory=os.path.join(app_conf['cache_dir'], 'templates'),
         input_encoding='utf-8', default_filters=['escape'],
         imports=['from webhelpers.html import escape'])
     #sets the c attribute access when don't existing attribute are accessed
     config['pylons.strict_tmpl_context'] = True
+    test = os.path.split(config['__file__'])[-1] == 'tests.ini'
     #MULTIPLE DB configs
     # Setup the SQLAlchemy database engine
-    if config['debug'] and os.path.split(config['__file__'])[-1] != 'tests.ini':
+    if config['debug'] and not test:
         #use query time debugging.
         from pylons_app.lib.timerproxy import TimerProxy
         sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.',
                                                             proxy=TimerProxy())
     else:
         sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
     init_model(sa_engine_db1)
     #init baseui
     config['pylons.app_globals'].baseui = make_ui('db')
     repo2db_mapper(_get_repos_cached_initial(config['pylons.app_globals'], initial))

pylons_app/tests/__init__.py

➞

Show inline comments

@@ @@ -22,25 +22,24 @@ __all__ = ['environ', 'url', 'TestContro @@
 # Invoke websetup with the current config file
 SetupCommand('setup-app').run([pylons.test.pylonsapp.config['__file__']])
 environ = {}
 class TestController(TestCase):
     def __init__(self, *args, **kwargs):
         wsgiapp = pylons.test.pylonsapp
         config = wsgiapp.config
         self.app = TestApp(wsgiapp)
         self.session = session
         url._push_object(URLGenerator(config['routes.map'], environ))
         self.sa = meta.Session
         TestCase.__init__(self, *args, **kwargs)
     def log_user(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':'test_admin',
                                   'password':'test'})
         assert response.status == '302 Found', 'Wrong response code from login got %s' % response.status
         assert response.session['hg_app_user'].username == 'test_admin', 'wrong logged in user'
         return response.follow()
@@ \ No newline at end of file @@

pylons_app/tests/functional/test_search.py

➞

Show inline comments

 from pylons_app.tests import *
 from pylons_app.lib.indexers import IDX_LOCATION
 import os
 from nose.plugins.skip import SkipTest
 class TestSearchController(TestController):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'))
         print response.body
         assert 'class="small" id="q" name="q" type="text"' in response.body,'Search box content error'
         # Test response...
     def test_empty_search(self):
         if os.path.isdir(IDX_LOCATION):
             raise SkipTest('skipped due to existing index')
         else:
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),{'q':'vcs_test'})
         assert 'There is no index to search in. Please run whoosh indexer' in response.body,'No error message about empty index'
@@ \ No newline at end of file @@
             assert 'There is no index to search in. Please run whoosh indexer' in response.body,'No error message about empty index'
     def test_normal_search(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),{'q':'def+repo'})
         print response.body
         assert '9 results' in response.body,'no message about proper search results'

0 comments (0 inline, 0 general)