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

Don't think about "tahoe start"

Browse Source
This commit is contained in:
Jean-Paul Calderone 2020-12-08 18:22:14 -05:00
parent 4d28b0ec27
commit ca92fa4eb5
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,10 +73,10 @@ class RunOptions(BasedirOptions):
] ]
def parseArgs(self, basedir=None, *twistd_args): def parseArgs(self, basedir=None, *twistd_args):
# This can't handle e.g. 'tahoe start --nodaemon', since '--nodaemon' # This can't handle e.g. 'tahoe run --reactor=foo', since
# looks like an option to the tahoe subcommand, not to twistd. So you # '--reactor=foo' looks like an option to the tahoe subcommand, not to
# can either use 'tahoe start' or 'tahoe start NODEDIR # twistd. So you can either use 'tahoe run' or 'tahoe run NODEDIR
# --TWISTD-OPTIONS'. Note that 'tahoe --node-directory=NODEDIR start # --TWISTD-OPTIONS'. Note that 'tahoe --node-directory=NODEDIR run
# --TWISTD-OPTIONS' also isn't allowed, unfortunately. # --TWISTD-OPTIONS' also isn't allowed, unfortunately.
BasedirOptions.parseArgs(self, basedir) BasedirOptions.parseArgs(self, basedir)

13
src/allmydata/test/test_runner.py
View File

@ -252,15 +252,10 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
RunBinTahoeMixin): RunBinTahoeMixin):
""" """
exercise "tahoe run" for both introducer, client node, and key-generator, exercise "tahoe run" for both introducer, client node, and key-generator,
by spawning "tahoe run" (or "tahoe start") as a subprocess. This doesn't by spawning "tahoe run" as a subprocess. This doesn't get us line-level
get us line-level coverage, but it does a better job of confirming that coverage, but it does a better job of confirming that the user can
the user can actually run "./bin/tahoe run" and expect it to work. This actually run "./bin/tahoe run" and expect it to work. This verifies that
verifies that bin/tahoe sets up PYTHONPATH and the like correctly. bin/tahoe sets up PYTHONPATH and the like correctly.
This doesn't work on cygwin (it hangs forever), so we skip this test
when we're on cygwin. It is likely that "tahoe start" itself doesn't
work on cygwin: twisted seems unable to provide a version of
spawnProcess which really works there.
""" """
def workdir(self, name): def workdir(self, name):