diff options
author | Andrew Bartlett <abartlet@samba.org> | 2016-07-18 15:47:03 +1200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2016-07-19 13:41:11 +0200 |
commit | 5568892d433bccd93ae9357c121c913405985f1a (patch) | |
tree | 2537624df63b6cb20dd81ab877de0d8d53053cbc /python | |
parent | b5d6f7bef14438fad0352a19feb7e660cff88bfe (diff) | |
download | samba-5568892d433bccd93ae9357c121c913405985f1a.tar.gz |
samba-tool: Put full command and subcommand in informative name when testing samba-tool
These are not used for anything other than to print in the usage, but
it seems nicer to match normal invocation of these commands
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'python')
-rw-r--r-- | python/samba/tests/samba_tool/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py index b71a5b39338..de6cf184348 100644 --- a/python/samba/tests/samba_tool/base.py +++ b/python/samba/tests/samba_tool/base.py @@ -67,7 +67,7 @@ class SambaToolCmdTest(samba.tests.BlackboxTestCase): cmd = cmd_sambatool.subcommands[name] cmd.outf = StringIO() cmd.errf = StringIO() - result = cmd._run(name, *args) + result = cmd._run("samba-tool %s" % name, *args) return (result, cmd.outf.getvalue(), cmd.errf.getvalue()) def runsubcmd(self, name, sub, *args): @@ -78,7 +78,7 @@ class SambaToolCmdTest(samba.tests.BlackboxTestCase): cmd = cmd_sambatool.subcommands[name].subcommands[sub] cmd.outf = StringIO() cmd.errf = StringIO() - result = cmd._run(name, *args) + result = cmd._run("samba-tool %s %s" % (name, sub), *args) return (result, cmd.outf.getvalue(), cmd.errf.getvalue()) def assertCmdSuccess(self, val, msg=""): |