diff --git a/rhodecode/tests/functional/test_search.py b/rhodecode/tests/functional/test_search.py --- a/rhodecode/tests/functional/test_search.py +++ b/rhodecode/tests/functional/test_search.py @@ -7,8 +7,9 @@ class TestSearchController(TestControlle 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' + + self.assertTrue('class="small" id="q" name="q" type="text"' in + response.body) # Test response... def test_empty_search(self): @@ -16,20 +17,21 @@ class TestSearchController(TestControlle raise SkipTest('skipped due to existing index') else: self.log_user() - 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' + response = self.app.get(url(controller='search', action='index'), + {'q':HG_REPO}) + self.assertTrue('There is no index to search in. ' + 'Please run whoosh indexer' in response.body) 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' - + response = self.app.get(url(controller='search', action='index'), + {'q':'def repo'}) + self.assertTrue('10 results' in response.body) + self.assertTrue('Permission denied' not in response.body) def test_repo_search(self): self.log_user() - 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' + response = self.app.get(url(controller='search', action='index'), + {'q':'repository:%s def test' % HG_REPO}) + self.assertTrue('4 results' in response.body) + self.assertTrue('Permission denied' not in response.body)