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

key-generator was apparently removed long ago

Browse Source
This commit is contained in:
Jean-Paul Calderone 2020-12-12 17:40:13 -05:00
parent b9e9e55f4e
commit f17a5dfafc
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,7 @@ def get_pid_from_pidfile(pidfile):
def identify_node_type(basedir): def identify_node_type(basedir):
""" """
:return unicode: None or one of: 'client', 'introducer', or :return unicode: None or one of: 'client' or 'introducer'.
'key-generator'
""" """
tac = u'' tac = u''
try: try:
@ -58,7 +57,7 @@ def identify_node_type(basedir):
except OSError: except OSError:
return None return None
for t in (u"client", u"introducer", u"key-generator"): for t in (u"client", u"introducer"):
if t in tac: if t in tac:
return t return t
return None return None

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

@ -144,8 +144,8 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, RunBinTahoeMixin):
class CreateNode(unittest.TestCase): class CreateNode(unittest.TestCase):
# exercise "tahoe create-node", create-introducer, and # exercise "tahoe create-node" and "tahoe create-introducer" by calling
# create-key-generator by calling the corresponding code as a subroutine. # the corresponding code as a subroutine.
def workdir(self, name): def workdir(self, name):
basedir = os.path.join("test_runner", "CreateNode", name) basedir = os.path.join("test_runner", "CreateNode", name)
@ -253,11 +253,11 @@ class CreateNode(unittest.TestCase):
class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin, 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 and client node, by spawning
by spawning "tahoe run" as a subprocess. This doesn't get us line-level "tahoe run" as a subprocess. This doesn't get us line-level coverage, but
coverage, but it does a better job of confirming that the user can it does a better job of confirming that the user can actually run
actually run "./bin/tahoe run" and expect it to work. This verifies that "./bin/tahoe run" and expect it to work. This verifies that bin/tahoe sets
bin/tahoe sets up PYTHONPATH and the like correctly. up PYTHONPATH and the like correctly.
""" """
def workdir(self, name): def workdir(self, name):