import os.path
-from twisted.trial import unittest
from cStringIO import StringIO
import urllib, sys
-from mock import Mock, call
+from twisted.trial import unittest
+from twisted.python.monkey import MonkeyPatcher
import allmydata
from allmydata.util import fileutil, hashutil, base32, keyutil
+from allmydata.util.namespace import Namespace
from allmydata import uri
from allmydata.immutable import upload
from allmydata.dirnode import normalize
from allmydata.util.assertutil import precondition
from allmydata.util.encodingutil import listdir_unicode, unicode_platform, \
- get_io_encoding, get_filesystem_encoding
+ get_io_encoding, get_filesystem_encoding, unicode_to_argv
timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
class CLITestMixin(ReallyEqualMixin):
def do_cli(self, verb, *args, **kwargs):
+ precondition(not [True for arg in args if not isinstance(arg, str)],
+ "arguments to do_cli must be strs -- convert using unicode_to_argv", args=args)
+
+ # client_num is used to execute client CLI commands on a specific client.
+ client_num = kwargs.get("client_num", 0)
+
nodeargs = [
- "--node-directory", self.get_clientdir(),
+ "--node-directory", unicode_to_argv(self.get_clientdir(i=client_num)),
]
argv = nodeargs + [verb] + list(args)
stdin = kwargs.get("stdin", "")
def test_exception_catcher(self):
self.basedir = "cli/exception_catcher"
- runner_mock = Mock()
- sys_exit_mock = Mock()
stderr = StringIO()
- self.patch(sys, "argv", ["tahoe"])
- self.patch(runner, "runner", runner_mock)
- self.patch(sys, "exit", sys_exit_mock)
- self.patch(sys, "stderr", stderr)
exc = Exception("canary")
+ ns = Namespace()
+ ns.runner_called = False
def call_runner(args, install_node_control=True):
+ ns.runner_called = True
+ self.failUnlessEqual(install_node_control, True)
raise exc
- runner_mock.side_effect = call_runner
- runner.run()
- self.failUnlessEqual(runner_mock.call_args_list, [call([], install_node_control=True)])
- self.failUnlessEqual(sys_exit_mock.call_args_list, [call(1)])
+ ns.sys_exit_called = False
+ def call_sys_exit(exitcode):
+ ns.sys_exit_called = True
+ self.failUnlessEqual(exitcode, 1)
+
+ patcher = MonkeyPatcher((runner, 'runner', call_runner),
+ (sys, 'argv', ["tahoe"]),
+ (sys, 'exit', call_sys_exit),
+ (sys, 'stderr', stderr))
+ patcher.runWithPatches(runner.run)
+
+ self.failUnless(ns.runner_called)
+ self.failUnless(ns.sys_exit_called)
self.failUnlessIn(str(exc), stderr.getvalue())
class Help(unittest.TestCase):
+ def failUnlessInNormalized(self, x, y):
+ # helper function to deal with the --help output being wrapped to
+ # various widths, depending on the $COLUMNS environment variable
+ self.failUnlessIn(x.replace("\n", " "), y.replace("\n", " "))
+
def test_get(self):
help = str(cli.GetOptions())
- self.failUnlessIn(" [global-opts] get [options] REMOTE_FILE LOCAL_FILE", help)
+ self.failUnlessIn("[options] REMOTE_FILE LOCAL_FILE", help)
self.failUnlessIn("% tahoe get FOO |less", help)
def test_put(self):
help = str(cli.PutOptions())
- self.failUnlessIn(" [global-opts] put [options] LOCAL_FILE REMOTE_FILE", help)
+ self.failUnlessIn("[options] LOCAL_FILE REMOTE_FILE", help)
self.failUnlessIn("% cat FILE | tahoe put", help)
def test_ls(self):
help = str(cli.ListOptions())
- self.failUnlessIn(" [global-opts] ls [options] [PATH]", help)
+ self.failUnlessIn("[options] [PATH]", help)
def test_unlink(self):
help = str(cli.UnlinkOptions())
- self.failUnlessIn(" [global-opts] unlink [options] REMOTE_FILE", help)
+ self.failUnlessIn("[options] REMOTE_FILE", help)
def test_rm(self):
help = str(cli.RmOptions())
- self.failUnlessIn(" [global-opts] rm [options] REMOTE_FILE", help)
+ self.failUnlessIn("[options] REMOTE_FILE", help)
def test_mv(self):
help = str(cli.MvOptions())
- self.failUnlessIn(" [global-opts] mv [options] FROM TO", help)
- self.failUnlessIn("Use 'tahoe mv' to move files", help)
+ self.failUnlessIn("[options] FROM TO", help)
+ self.failUnlessInNormalized("Use 'tahoe mv' to move files", help)
def test_cp(self):
help = str(cli.CpOptions())
- self.failUnlessIn(" [global-opts] cp [options] FROM.. TO", help)
- self.failUnlessIn("Use 'tahoe cp' to copy files", help)
+ self.failUnlessIn("[options] FROM.. TO", help)
+ self.failUnlessInNormalized("Use 'tahoe cp' to copy files", help)
def test_ln(self):
help = str(cli.LnOptions())
- self.failUnlessIn(" [global-opts] ln [options] FROM_LINK TO_LINK", help)
- self.failUnlessIn("Use 'tahoe ln' to duplicate a link", help)
+ self.failUnlessIn("[options] FROM_LINK TO_LINK", help)
+ self.failUnlessInNormalized("Use 'tahoe ln' to duplicate a link", help)
def test_mkdir(self):
help = str(cli.MakeDirectoryOptions())
- self.failUnlessIn(" [global-opts] mkdir [options] [REMOTE_DIR]", help)
- self.failUnlessIn("Create a new directory", help)
+ self.failUnlessIn("[options] [REMOTE_DIR]", help)
+ self.failUnlessInNormalized("Create a new directory", help)
def test_backup(self):
help = str(cli.BackupOptions())
- self.failUnlessIn(" [global-opts] backup [options] FROM ALIAS:TO", help)
+ self.failUnlessIn("[options] FROM ALIAS:TO", help)
def test_webopen(self):
help = str(cli.WebopenOptions())
- self.failUnlessIn(" [global-opts] webopen [options] [ALIAS:PATH]", help)
+ self.failUnlessIn("[options] [ALIAS:PATH]", help)
def test_manifest(self):
help = str(cli.ManifestOptions())
- self.failUnlessIn(" [global-opts] manifest [options] [ALIAS:PATH]", help)
+ self.failUnlessIn("[options] [ALIAS:PATH]", help)
def test_stats(self):
help = str(cli.StatsOptions())
- self.failUnlessIn(" [global-opts] stats [options] [ALIAS:PATH]", help)
+ self.failUnlessIn("[options] [ALIAS:PATH]", help)
def test_check(self):
help = str(cli.CheckOptions())
- self.failUnlessIn(" [global-opts] check [options] [ALIAS:PATH]", help)
+ self.failUnlessIn("[options] [ALIAS:PATH]", help)
def test_deep_check(self):
help = str(cli.DeepCheckOptions())
- self.failUnlessIn(" [global-opts] deep-check [options] [ALIAS:PATH]", help)
+ self.failUnlessIn("[options] [ALIAS:PATH]", help)
def test_create_alias(self):
help = str(cli.CreateAliasOptions())
- self.failUnlessIn(" [global-opts] create-alias [options] ALIAS[:]", help)
+ self.failUnlessIn("[options] ALIAS[:]", help)
def test_add_alias(self):
help = str(cli.AddAliasOptions())
- self.failUnlessIn(" [global-opts] add-alias [options] ALIAS[:] DIRCAP", help)
+ self.failUnlessIn("[options] ALIAS[:] DIRCAP", help)
def test_list_aliases(self):
help = str(cli.ListAliasesOptions())
- self.failUnlessIn(" [global-opts] list-aliases [options]", help)
+ self.failUnlessIn("[options]", help)
def test_start(self):
help = str(startstop_node.StartOptions())
- self.failUnlessIn(" [global-opts] start [options] [NODEDIR [twistd-options]]", help)
+ self.failUnlessIn("[options] [NODEDIR [twistd-options]]", help)
def test_stop(self):
help = str(startstop_node.StopOptions())
- self.failUnlessIn(" [global-opts] stop [options] [NODEDIR]", help)
+ self.failUnlessIn("[options] [NODEDIR]", help)
def test_restart(self):
help = str(startstop_node.RestartOptions())
- self.failUnlessIn(" [global-opts] restart [options] [NODEDIR [twistd-options]]", help)
+ self.failUnlessIn("[options] [NODEDIR [twistd-options]]", help)
def test_run(self):
help = str(startstop_node.RunOptions())
- self.failUnlessIn(" [global-opts] run [options] [NODEDIR [twistd-options]]", help)
+ self.failUnlessIn("[options] [NODEDIR [twistd-options]]", help)
def test_create_client(self):
help = str(create_node.CreateClientOptions())
- self.failUnlessIn(" [global-opts] create-client [options] [NODEDIR]", help)
+ self.failUnlessIn("[options] [NODEDIR]", help)
def test_create_node(self):
help = str(create_node.CreateNodeOptions())
- self.failUnlessIn(" [global-opts] create-node [options] [NODEDIR]", help)
+ self.failUnlessIn("[options] [NODEDIR]", help)
def test_create_introducer(self):
help = str(create_node.CreateIntroducerOptions())
- self.failUnlessIn(" [global-opts] create-introducer [options] NODEDIR", help)
+ self.failUnlessIn("[options] NODEDIR", help)
def test_debug_trial(self):
help = str(debug.TrialOptions())
- self.failUnlessIn(" [global-opts] debug trial [options] [[file|package|module|TestCase|testmethod]...]", help)
- self.failUnlessIn("The 'tahoe debug trial' command uses the correct imports", help)
+ self.failUnlessIn(" [global-options] debug trial [options] [[file|package|module|TestCase|testmethod]...]", help)
+ self.failUnlessInNormalized("The 'tahoe debug trial' command uses the correct imports", help)
def test_debug_flogtool(self):
options = debug.FlogtoolOptions()
help = str(options)
- self.failUnlessIn(" [global-opts] debug flogtool ", help)
- self.failUnlessIn("The 'tahoe debug flogtool' command uses the correct imports", help)
+ self.failUnlessIn(" [global-options] debug flogtool ", help)
+ self.failUnlessInNormalized("The 'tahoe debug flogtool' command uses the correct imports", help)
for (option, shortcut, oClass, desc) in options.subCommands:
subhelp = str(oClass())
- self.failUnlessIn(" [global-opts] debug flogtool %s " % (option,), subhelp)
+ self.failUnlessIn(" [global-options] debug flogtool %s " % (option,), subhelp)
class Ln(GridTestMixin, CLITestMixin, unittest.TestCase):
projects / tahoe-lafs / tahoe-lafs.git / blobdiff