--- a/rhodecode/tests/functional/test_search.py	Sun Nov 14 01:30:02 2010 +0100
+++ b/rhodecode/tests/functional/test_search.py	Sun Nov 14 17:24:32 2010 +0100
@@ -1,5 +1,4 @@
 from rhodecode.tests import *
-from rhodecode.lib.indexers import IDX_LOCATION
 import os
 from nose.plugins.skip import SkipTest
 
@@ -13,26 +12,25 @@
         # Test response...
 
     def test_empty_search(self):
-        
-        if os.path.isdir(IDX_LOCATION):
+        if os.path.isdir(self.index_location):
             raise SkipTest('skipped due to existing index')
         else:
             self.log_user()
-            response = self.app.get(url(controller='search', action='index'), {'q':'vcs_test'})
+            response = self.app.get(url(controller='search', action='index'), {'q':HG_REPO})
             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 '10 results' in response.body, 'no message about proper search results'
         assert 'Permission denied' not in response.body, 'Wrong permissions settings for that repo and user'
-        
-    
+
+
     def test_repo_search(self):
         self.log_user()
-        response = self.app.get(url(controller='search', action='index'), {'q':'repository:vcs_test def test'})
+        response = self.app.get(url(controller='search', action='index'), {'q':'repository:%s def test' % HG_REPO})
         print response.body
         assert '4 results' in response.body, 'no message about proper search results'
         assert 'Permission denied' not in response.body, 'Wrong permissions settings for that repo and user'
-        
+