# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1284168933 -7200
# Node ID e94f4e54dc03992b1252b5832a344b199ae5cd1a
# Parent  9dd372c7166cd816116852f9c2123d58dc1d7604
tests fix, put vcs testing tarball

diff -r 9dd372c7166c -r e94f4e54dc03 pylons_app/config/environment.py
--- a/pylons_app/config/environment.py	Sat Sep 11 02:56:22 2010 +0200
+++ b/pylons_app/config/environment.py	Sat Sep 11 03:35:33 2010 +0200
@@ -49,10 +49,10 @@
 
     #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.',
diff -r 9dd372c7166c -r e94f4e54dc03 pylons_app/tests/__init__.py
--- a/pylons_app/tests/__init__.py	Sat Sep 11 02:56:22 2010 +0200
+++ b/pylons_app/tests/__init__.py	Sat Sep 11 03:35:33 2010 +0200
@@ -31,7 +31,6 @@
         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)
diff -r 9dd372c7166c -r e94f4e54dc03 pylons_app/tests/functional/test_search.py
--- a/pylons_app/tests/functional/test_search.py	Sat Sep 11 02:56:22 2010 +0200
+++ b/pylons_app/tests/functional/test_search.py	Sat Sep 11 03:35:33 2010 +0200
@@ -1,4 +1,7 @@
 from pylons_app.tests import *
+from pylons_app.lib.indexers import IDX_LOCATION
+import os
+from nose.plugins.skip import SkipTest
 
 class TestSearchController(TestController):
 
@@ -10,6 +13,17 @@
         # 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'
+        
+    def test_normal_search(self):
         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
+        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'
+        
diff -r 9dd372c7166c -r e94f4e54dc03 pylons_app/tests/vcs_test.tar.gz
Binary file pylons_app/tests/vcs_test.tar.gz has changed
diff -r 9dd372c7166c -r e94f4e54dc03 pylons_app/websetup.py
--- a/pylons_app/websetup.py	Sat Sep 11 02:56:22 2010 +0200
+++ b/pylons_app/websetup.py	Sat Sep 11 03:35:33 2010 +0200
@@ -8,7 +8,8 @@
 import logging
 import os
 import sys
-import shutil
+import tarfile
+
 log = logging.getLogger(__name__)
 
 ROOT = dn(dn(os.path.realpath(__file__)))
@@ -28,8 +29,10 @@
         
         if not os.path.isdir(REPO_TEST_PATH):
             os.mkdir(REPO_TEST_PATH)
-            from_ = '/home/marcink/workspace-python/vcs'
-            shutil.copytree(from_, os.path.join(REPO_TEST_PATH,'vcs_test'))
+            cur_dir = dn(os.path.abspath(__file__))
+            tar = tarfile.open(jn(cur_dir,'tests',"vcs_test.tar.gz"))
+            tar.extractall(REPO_TEST_PATH)
+            tar.close()
             
         tests = True