From e12bc5b320698ef4a3e6bc338069ad542e1d89b0 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Wed, 28 Oct 2015 13:49:43 +0000 Subject: [PATCH] Add test for 'tahoe create-node/client/introducer' output. closes ticket:2556 Signed-off-by: Daira Hopwood --- src/allmydata/test/test_runner.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py index 06d9f1036..e737213f6 100644 --- a/src/allmydata/test/test_runner.py +++ b/src/allmydata/test/test_runner.py @@ -7,7 +7,8 @@ from twisted.python import usage, runtime from twisted.internet import threads from allmydata.util import fileutil, pollmixin -from allmydata.util.encodingutil import unicode_to_argv, unicode_to_output, get_filesystem_encoding +from allmydata.util.encodingutil import unicode_to_argv, unicode_to_output, \ + get_filesystem_encoding, quote_local_unicode_path from allmydata.scripts import runner from allmydata.client import Client from allmydata.test import common_util @@ -298,6 +299,19 @@ class CreateNode(unittest.TestCase): self.failUnless(os.path.exists(n3)) self.failUnless(os.path.exists(os.path.join(n3, tac))) + if kind in ("client", "node", "introducer"): + # test that the output (without --quiet) includes the base directory + n4 = os.path.join(basedir, command + "-n4") + argv = [command, n4] + rc, out, err = self.run_tahoe(argv) + self.failUnlessEqual(err, "") + self.failUnlessIn(" created in ", out) + self.failUnlessIn(n4, out) + self.failIfIn("\\\\?\\", out) + self.failUnlessEqual(rc, 0) + self.failUnless(os.path.exists(n4)) + self.failUnless(os.path.exists(os.path.join(n4, tac))) + # make sure it rejects too many arguments argv = [command, "basedir", "extraarg"] self.failUnlessRaises(usage.UsageError,