comparison tests/test_utility_commands.py @ 865:04729f3a3d17

test_util: merge load_fixture_and_fetch() into TestBase method The middle-term goal is to make TestBase repo_path and wc_path private, so they can be changed for every load call. This is not required to use nosetests multiprocess facility as the fixtures create temporary directories but it makes things much clearer and avoid weird cases where a repository was loaded several times at the same location in a single test (cf test_startrev). That way we will be more confident the tests can be parallelized. The long term goal is to make hgsubversion compatible with nosetests --processes option.
author Patrick Mezard <patrick@mezard.eu>
date Thu, 19 Apr 2012 18:29:25 +0200
parents 312b37bc5e20
children 20e73b5ab6f7
comparison
equal deleted inserted replaced
864:39d45f2190ee 865:04729f3a3d17
209 self.assertEqual(self.repo['tip'].parents()[0].parents()[0], self.repo[0]) 209 self.assertEqual(self.repo['tip'].parents()[0].parents()[0], self.repo[0])
210 self.assertNotEqual(beforerebasehash, self.repo['tip'].node()) 210 self.assertNotEqual(beforerebasehash, self.repo['tip'].node())
211 211
212 def test_genignore(self): 212 def test_genignore(self):
213 """ Test generation of .hgignore file. """ 213 """ Test generation of .hgignore file. """
214 test_util.load_fixture_and_fetch('ignores.svndump', self.repo_path, 214 repo = self._load_fixture_and_fetch('ignores.svndump', noupdate=False)
215 self.wc_path, noupdate=False) 215 u = self.ui()
216 u = self.ui() 216 u.pushbuffer()
217 u.pushbuffer() 217 svncommands.genignore(u, repo, self.wc_path)
218 svncommands.genignore(u, self.repo, self.wc_path)
219 self.assertMultiLineEqual(open(os.path.join(self.wc_path, '.hgignore')).read(), 218 self.assertMultiLineEqual(open(os.path.join(self.wc_path, '.hgignore')).read(),
220 '.hgignore\nsyntax:glob\nblah\notherblah\nbaz/magic\n') 219 '.hgignore\nsyntax:glob\nblah\notherblah\nbaz/magic\n')
221 220
222 def test_genignore_single(self): 221 def test_genignore_single(self):
223 self._load_fixture_and_fetch('ignores.svndump', subdir='trunk') 222 self._load_fixture_and_fetch('ignores.svndump', subdir='trunk')