revset tests: use requiresmodule decorator

This commit is contained in:
Augie Fackler 2010-10-05 17:30:01 -05:00
parent 04eaea5235
commit 2dea063a65

View File

@ -49,36 +49,37 @@ class TestLogKeywords(test_util.TestBase):
'1:df2126f7-00ab-4d49-b42c-7e981dde0bcf ' '1:df2126f7-00ab-4d49-b42c-7e981dde0bcf '
'2: ')) '2: '))
if templatekw and revset: @test_util.requiresmodule(revset)
def test_svn_revsets(self): @test_util.requiresmodule(templatekw)
repo = self._load_fixture_and_fetch('two_revs.svndump') def test_svn_revsets(self):
repo = self._load_fixture_and_fetch('two_revs.svndump')
# we want one commit that isn't from Subversion # we want one commit that isn't from Subversion
self.commitchanges([('foo', 'foo', 'frobnicate\n')]) self.commitchanges([('foo', 'foo', 'frobnicate\n')])
defaults = {'date': None, 'rev': ['fromsvn()'], 'user': None} defaults = {'date': None, 'rev': ['fromsvn()'], 'user': None}
ui = CapturingUI() ui = CapturingUI()
commands.log(ui, repo, template='{rev}:{svnrev} ', **defaults) commands.log(ui, repo, template='{rev}:{svnrev} ', **defaults)
self.assertEqual(ui._output, '0:2 1:3 ') self.assertEqual(ui._output, '0:2 1:3 ')
defaults = {'date': None, 'rev': ['svnrev(2)'], 'user': None} defaults = {'date': None, 'rev': ['svnrev(2)'], 'user': None}
ui = CapturingUI() ui = CapturingUI()
commands.log(ui, repo, template='{rev}:{svnrev} ', **defaults) commands.log(ui, repo, template='{rev}:{svnrev} ', **defaults)
self.assertEqual(ui._output, '0:2 ') self.assertEqual(ui._output, '0:2 ')
defaults = {'date': None, 'rev': ['fromsvn(1)'], 'user': None} defaults = {'date': None, 'rev': ['fromsvn(1)'], 'user': None}
self.assertRaises(error.ParseError, self.assertRaises(error.ParseError,
commands.log, self.ui(), repo, commands.log, self.ui(), repo,
template='{rev}:{svnrev} ', **defaults) template='{rev}:{svnrev} ', **defaults)
defaults = {'date': None, 'rev': ['svnrev(1, 2)'], 'user': None} defaults = {'date': None, 'rev': ['svnrev(1, 2)'], 'user': None}
self.assertRaises(error.ParseError, self.assertRaises(error.ParseError,
commands.log, self.ui(), repo, commands.log, self.ui(), repo,
template='{rev}:{svnrev} ', **defaults) template='{rev}:{svnrev} ', **defaults)
def suite(): def suite():
all = [unittest.TestLoader().loadTestsFromTestCase(TestLogKeywords),] all = [unittest.TestLoader().loadTestsFromTestCase(TestLogKeywords),]