From: Douglas Bagnall Date: Wed, 7 Sep 2022 10:03:47 +0000 (+1200) Subject: pytest/netcmd: fix for new samba-tool api X-Git-Tag: talloc-2.4.0~1123 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c41887d903fc5a4f384dd6ef2166fd6288406e11;p=thirdparty%2Fsamba.git pytest/netcmd: fix for new samba-tool api In this case we are skipping _resolve(). Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/netcmd.py b/python/samba/tests/netcmd.py index 833ad418923..63f204a2c23 100644 --- a/python/samba/tests/netcmd.py +++ b/python/samba/tests/netcmd.py @@ -31,8 +31,9 @@ class NetCmdTestCase(samba.tests.TestCaseInTempDir): def run_netcmd(self, cmd_klass, args, retcode=0): cmd = cmd_klass(outf=StringIO(), errf=StringIO()) + cmd.command_name = "apricots" try: - retval = cmd._run(cmd_klass.__name__, *args) + retval = cmd._run(*args) except Exception as e: cmd.show_command_error(e) retval = 1 diff --git a/selftest/flapping.d/samba-tool b/selftest/flapping.d/samba-tool index f277c8e9096..0d6c16d9a33 100644 --- a/selftest/flapping.d/samba-tool +++ b/selftest/flapping.d/samba-tool @@ -1,3 +1,2 @@ -^samba.tests.netcmd. ^samba.tests.blackbox.samba_dnsupdate ^samba4.ldap.password_lockout.python