From: Joseph Sutton Date: Wed, 28 Apr 2021 03:46:46 +0000 (+1200) Subject: samba-tool:testparm: Display nicer parameter dump error messages X-Git-Tag: tevent-0.11.0~870 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d7017b30248c2855248a9bab56fd5b91597686c;p=thirdparty%2Fsamba.git samba-tool:testparm: Display nicer parameter dump error messages Now we catch errors for unknown sections or parameters and turn them into CommandErrors. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14143 Signed-off-by: Joseph Sutton Reviewed-by: Rowland Penny Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/netcmd/testparm.py b/python/samba/netcmd/testparm.py index 5219b8c6ad9..b44dea1f141 100644 --- a/python/samba/netcmd/testparm.py +++ b/python/samba/netcmd/testparm.py @@ -103,9 +103,17 @@ class cmd_testparm(Command): else: if section_name is not None or parameter_name is not None: if parameter_name is None: - lp[section_name].dump(lp.default_service, verbose) + try: + section = lp[section_name] + except KeyError: + raise CommandError("Unknown section %s" % section_name) + else: + section.dump(lp.default_service, verbose) else: - lp.dump_a_parameter(parameter_name, section_name) + try: + lp.dump_a_parameter(parameter_name, section_name) + except RuntimeError as e: + raise CommandError(e) else: if not suppress_prompt: self.outf.write("Press enter to see a dump of your service definitions\n") diff --git a/selftest/knownfail.d/bug-14143 b/selftest/knownfail.d/bug-14143 deleted file mode 100644 index 2902127ed9b..00000000000 --- a/selftest/knownfail.d/bug-14143 +++ /dev/null @@ -1,2 +0,0 @@ -^samba.tests.netcmd.samba.tests.netcmd.TestParmTests.test_no_such_section -^samba.tests.netcmd.samba.tests.netcmd.TestParmTests.test_no_such_parameter