mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-23 14:52:26 +00:00
test_runner: cleanup, refactor common code into a non-executable method
Having both test_node() and test_client() (one of which calls the other) felt confusing to me, so I changed it to have test_node(), test_client(), and a common do_create() helper method.
This commit is contained in:
parent
5045a8721a
commit
3880486f91
@ -64,8 +64,7 @@ class CreateNode(unittest.TestCase):
|
||||
rc = runner.runner(argv, stdout=out, stderr=err)
|
||||
return rc, out.getvalue(), err.getvalue()
|
||||
|
||||
def test_node(self, command="create-node"):
|
||||
basedir = self.workdir("test_node")
|
||||
def do_create(self, command, basedir):
|
||||
c1 = os.path.join(basedir, command + "-c1")
|
||||
argv = ["--quiet", command, "--basedir", c1]
|
||||
rc, out, err = self.run_tahoe(argv)
|
||||
@ -109,9 +108,14 @@ class CreateNode(unittest.TestCase):
|
||||
runner.runner, argv,
|
||||
run_by_human=False)
|
||||
|
||||
def test_node(self):
|
||||
basedir = self.workdir("test_node")
|
||||
self.do_create("create-node", basedir)
|
||||
|
||||
def test_client(self):
|
||||
# create-client should behave like create-node --no-storage.
|
||||
self.test_node(command="create-client")
|
||||
basedir = self.workdir("test_client")
|
||||
self.do_create("create-client", basedir)
|
||||
|
||||
def test_introducer(self):
|
||||
basedir = self.workdir("test_introducer")
|
||||
|
Loading…
Reference in New Issue
Block a user