pytest/netcmd: fix for new samba-tool api

In this case we are skipping _resolve().

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/netcmd.py b/python/samba/tests/netcmd.py
index 833ad418923411cc9da99e61587272b6162ff21e..63f204a2c2393d6df00aae0cc8d9fe1a0269c233 100644 (file)
--- 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 f277c8e9096bf67fdc9334ae896f3a0c052b6758..0d6c16d9a33e1bda0a0e0eb6c8f5b3dd53b858ba 100644 (file)
--- 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