# HG changeset patch # User Gregory Szorc # Date 2014-05-05 05:07:45 # Node ID 26d2fb899637086388b0368edaff8ecf6669ef8f # Parent 5a4d1a6c605fc6f1790fcb901cfb303b85cd82eb tests: define norepo in command decorator diff --git a/tests/test-commandserver.py b/tests/test-commandserver.py --- a/tests/test-commandserver.py +++ b/tests/test-commandserver.py @@ -341,10 +341,9 @@ if __name__ == '__main__': check(mqoutsidechanges) dbg = open('dbgui.py', 'w') dbg.write('from mercurial import cmdutil, commands\n' - 'commands.norepo += " debuggetpass"\n' 'cmdtable = {}\n' 'command = cmdutil.command(cmdtable)\n' - '@command("debuggetpass")\n' + '@command("debuggetpass", norepo=True)\n' 'def debuggetpass(ui):\n' ' ui.write("%s\\n" % ui.getpass())\n') dbg.close() diff --git a/tests/test-extension.t b/tests/test-extension.t --- a/tests/test-extension.t +++ b/tests/test-extension.t @@ -18,11 +18,10 @@ Test basic extension support > def foo(ui, *args, **kwargs): > ui.write("Foo\\n") > - > @command('bar', [], 'hg bar') + > @command('bar', [], 'hg bar', norepo=True) > def bar(ui, *args, **kwargs): > ui.write("Bar\\n") > - > commands.norepo += ' bar' > EOF $ abspath=`pwd`/foobar.py @@ -481,11 +480,10 @@ Test help topic with same name as extens > command = cmdutil.command(cmdtable) > """multirevs extension > Big multi-line module docstring.""" - > @command('multirevs', [], 'ARG') + > @command('multirevs', [], 'ARG', norepo=True) > def multirevs(ui, repo, arg, *args, **opts): > """multirevs command""" > pass - > commands.norepo += ' multirevs' > EOF $ echo "multirevs = multirevs.py" >> $HGRCPATH @@ -537,12 +535,11 @@ Issue811: Problem loading extensions twi > cmdtable = {} > command = cmdutil.command(cmdtable) > - > @command('debugextensions', [], 'hg debugextensions') + > @command('debugextensions', [], 'hg debugextensions', norepo=True) > def debugextensions(ui): > "yet another debug command" > ui.write("%s\n" % '\n'.join([x for x, y in extensions.extensions()])) > - > commands.norepo += " debugextensions" > EOF $ echo "debugissue811 = $debugpath" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH @@ -631,11 +628,10 @@ Broken disabled extension and command: > command = cmdutil.command(cmdtable) > class Bogon(Exception): pass > - > @command('throw', [], 'hg throw') + > @command('throw', [], 'hg throw', norepo=True) > def throw(ui, **opts): > """throws an exception""" > raise Bogon() - > commands.norepo += " throw" > EOF No declared supported version, extension complains: $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*' diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -639,12 +639,12 @@ Test command without options > [('', 'longdesc', 3, 'x'*90), > ('n', '', None, 'normal desc'), > ('', 'newline', '', 'line1\nline2')], - > 'hg nohelp') + > 'hg nohelp', + > norepo=True) > @command('debugoptDEP', [('', 'dopt', None, 'option is DEPRECATED')]) > def nohelp(ui, *args, **kwargs): > pass > - > commands.norepo += ' nohelp' > EOF $ echo '[extensions]' >> $HGRCPATH $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH diff --git a/tests/test-progress.t b/tests/test-progress.t --- a/tests/test-progress.t +++ b/tests/test-progress.t @@ -18,7 +18,8 @@ > [('', 'total', '', 'override for total'), > ('', 'nested', False, 'show nested results'), > ('', 'parallel', False, 'show parallel sets of results')], - > 'hg loop LOOPS') + > 'hg loop LOOPS', + > norepo=True) > def loop(ui, loops, **opts): > loops = int(loops) > total = None @@ -46,7 +47,6 @@ > 'nested', None, 'nested.done', 'nestnum', nested_steps) > ui.progress('loop', None, 'loop.done', 'loopnum', total) > - > commands.norepo += " loop" > EOF $ cp $HGRCPATH $HGRCPATH.orig