ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-29 07:33:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Parameterize stderr to allmydata.scripts.runner.run

Browse Source
This commit is contained in:
Jean-Paul Calderone 2020-12-16 20:55:00 -05:00
parent 1f229ce9f6
commit a4b0b4a01a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/allmydata/scripts/runner.py
View File

@ -171,7 +171,7 @@ def _maybe_enable_eliot_logging(options, reactor):
# Pass on the options so we can dispatch the subcommand. # Pass on the options so we can dispatch the subcommand.
return options return options
def run(argv=sys.argv): def run(argv=sys.argv, stderr=sys.stderr):
# TODO(3035): Remove tox-check when error becomes a warning # TODO(3035): Remove tox-check when error becomes a warning
if 'TOX_ENV_NAME' not in os.environ: if 'TOX_ENV_NAME' not in os.environ:
assert sys.version_info < (3,), u"Tahoe-LAFS does not run under Python 3. Please use Python 2.7.x." assert sys.version_info < (3,), u"Tahoe-LAFS does not run under Python 3. Please use Python 2.7.x."
@ -180,7 +180,7 @@ def run(argv=sys.argv):
from allmydata.windows.fixups import initialize from allmydata.windows.fixups import initialize
initialize() initialize()
# doesn't return: calls sys.exit(rc) # doesn't return: calls sys.exit(rc)
task.react(_run_with_reactor, argv) task.react(_run_with_reactor, argv, stderr)
def _setup_coverage(reactor, argv): def _setup_coverage(reactor, argv):
@ -223,7 +223,7 @@ def _setup_coverage(reactor, argv):
reactor.addSystemEventTrigger('after', 'shutdown', write_coverage_data) reactor.addSystemEventTrigger('after', 'shutdown', write_coverage_data)
def _run_with_reactor(reactor, argv): def _run_with_reactor(reactor, argv, stderr):
_setup_coverage(reactor, argv) _setup_coverage(reactor, argv)
@ -237,7 +237,7 @@ def _run_with_reactor(reactor, argv):
# weren't using react(). # weren't using react().
if f.check(SystemExit): if f.check(SystemExit):
return f # dispatch function handled it return f # dispatch function handled it
f.printTraceback(file=sys.stderr) f.printTraceback(file=stderr)
sys.exit(1) sys.exit(1)
d.addErrback(_show_exception) d.addErrback(_show_exception)
return d return d

4
src/allmydata/test/cli/test_cli.py
View File

@ -534,12 +534,12 @@ class CLI(CLITestMixin, unittest.TestCase):
patcher = MonkeyPatcher((runner, 'parse_or_exit_with_explanation', patcher = MonkeyPatcher((runner, 'parse_or_exit_with_explanation',
call_parse_or_exit), call_parse_or_exit),
(sys, 'exit', call_sys_exit), (sys, 'exit', call_sys_exit),
(sys, 'stderr', stderr),
(task, 'react', fake_react), (task, 'react', fake_react),
) )
patcher.runWithPatches( patcher.runWithPatches(
lambda: runner.run( lambda: runner.run(
["tahoe"], argv=["tahoe"],
stderr=stderr,
), ),
) )