kallithea Changeset - 9211cc737587

Changeset - 9211cc737587

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Thomas De Schampheleire - 10 years ago 2016-02-10 19:26:22
thomas.de.schampheleire@gmail.com

pytest migration: search: use tmpdir fixture instead of 'current dir'

The test_empty_search method needs to refer to an existing directory that is
guaranteed to not contain a search index. The current implementation chose
the 'current' directory '.' but it is more of a hack than careful planning.
A temporary empty directory would be cleaner but was more involved to
create.

With the introduction of pytest-style test classes, this can very easily
be improved. Creating a temporary directory with pytest is as simple as
accepting the magic 'tmpdir' argument to the test method. This 'tmpdir' is
a fixture provided by pytest. The variable is initialized with a
py.path.local object referring a temporary directory. For details, see:
http://pytest.org/latest/tmpdir.html

1 file changed with 3 insertions and 3 deletions:

kallithea/tests/functional/test_search.py

0 comments (0 inline, 0 general)

kallithea/tests/functional/test_search.py

➞

Show inline comments

 import mock
 import os
 from kallithea.tests import *
-class TestSearchController(TestController):
+class TestSearchController(TestControllerPytest):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'))
         response.mustcontain('class="small" id="q" name="q" type="text"')
         # Test response...
     def test_empty_search(self):
+    def test_empty_search(self, tmpdir):
         self.log_user()
         config_mock = {
             'app_conf': {
                 # can be any existing dir that does not contain an actual index
-                'index_dir': '.',
+                'index_dir': str(tmpdir),
+            }
+        }
         with mock.patch('kallithea.controllers.search.config', config_mock):
             response = self.app.get(url(controller='search', action='index'),
                                     {'q': HG_REPO})
             response.mustcontain('There is no index to search in. '
                                  'Please run whoosh indexer')
     def test_normal_search(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),
                                 {'q': 'def repo'})
         response.mustcontain('58 results')
     def test_repo_search(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),
                                 {'q': 'repository:%s def test' % HG_REPO})
         response.mustcontain('18 results')
     def test_search_last(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),
                                 {'q': 'last:t', 'type': 'commit'})
         response.mustcontain('2 results')
     def test_search_commit_message(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),
                     {'q': 'bother to ask where to fetch repo during tests',
                      'type': 'commit'})
         response.mustcontain('2 results')
         response.mustcontain('a00c1b6f5d7a6ae678fd553a8b81d92367f7ecf1')
         response.mustcontain('c6eb379775c578a95dad8ddab53f963b80894850')
     def test_search_commit_message_hg_repo(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index',
                                     repo_name=HG_REPO),
                     {'q': 'bother to ask where to fetch repo during tests',
                      'type': 'commit'})
         response.mustcontain('1 results')
         response.mustcontain('a00c1b6f5d7a6ae678fd553a8b81d92367f7ecf1')
     def test_search_commit_changed_file(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),
                                 {'q': 'changed:tests/utils.py',
                                  'type': 'commit'})
         response.mustcontain('29 results')
     def test_search_commit_changed_files_get_commit(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),
                                 {'q': 'changed:vcs/utils/archivers.py',
                                  'type': 'commit'})
         response.mustcontain('8 results')
         response.mustcontain('25213a5fbb048dff8ba65d21e466a835536e5b70')
         response.mustcontain('47aedd538bf616eedcb0e7d630ea476df0e159c7')
         response.mustcontain('f5d23247fad4856a1dabd5838afade1e0eed24fb')
         response.mustcontain('04ad456aefd6461aea24f90b63954b6b1ce07b3e')
         response.mustcontain('c994f0de03b2a0aa848a04fc2c0d7e737dba31fc')
         response.mustcontain('d1f898326327e20524fe22417c22d71064fe54a1')
         response.mustcontain('fe568b4081755c12abf6ba673ba777fc02a415f3')
         response.mustcontain('bafe786f0d8c2ff7da5c1dcfcfa577de0b5e92f1')
     def test_search_commit_added_file(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),
                                 {'q': 'added:README.rst',
                                  'type': 'commit'})
         response.mustcontain('2 results')
         # Hg
         response.mustcontain('3803844fdbd3b711175fc3da9bdacfcd6d29a6fb')
         # Git
         response.mustcontain('ff7ca51e58c505fec0dd2491de52c622bb7a806b')
     def test_search_author(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),
                     {'q': 'author:marcin@python-blog.com raw_id:b986218ba1c9b0d6a259fac9b050b1724ed8e545',
                      'type': 'commit'})
         response.mustcontain('1 results')
     def test_search_file_name(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'),
                     {'q': 'README.rst', 'type': 'path'})

0 comments (0 inline, 0 general)