From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 7 Sep 2022 10:03:16 +0000 (+1200)
Subject: pytest/samba_dnsupdate: fix using samba-tool function
X-Git-Tag: talloc-2.4.0~1122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=202182e0fdc58388a5c4b0de0b94aa5431c01018;p=thirdparty%2Fsamba.git

pytest/samba_dnsupdate: fix using samba-tool function

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

diff --git a/python/samba/tests/blackbox/samba_dnsupdate.py b/python/samba/tests/blackbox/samba_dnsupdate.py
index f51ee4dff27..8fcdd207f73 100644
--- a/python/samba/tests/blackbox/samba_dnsupdate.py
+++ b/python/samba/tests/blackbox/samba_dnsupdate.py
@@ -19,7 +19,7 @@
 import samba.tests
 from io import StringIO
 from samba.common import get_string
-from samba.netcmd.main import cmd_sambatool
+from samba.netcmd.main import samba_tool
 from samba.credentials import Credentials
 from samba.auth import system_session
 from samba.samdb import SamDB
@@ -71,17 +71,17 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase):
         self.assertTrue(b"No DNS updates needed" in out, out + rpc_out)
 
     def test_add_new_uncovered_site(self):
-        name = 'sites'
-        cmd = cmd_sambatool.subcommands[name]
-        cmd.outf = StringIO()
-        cmd.errf = StringIO()
-
         site_name = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
         # Clear out any existing site
-        cmd._run("samba-tool %s" % name, 'remove', site_name)
+        result = samba_tool('sites', 'remove', site_name,
+                            outf=StringIO(),
+                            errf=StringIO())
+
+        result = samba_tool('sites', 'create', site_name,
+                            outf=StringIO(),
+                            errf=StringIO())
 
-        result = cmd._run("samba-tool %s" % name, 'create', site_name)
         if result is not None:
             self.fail("Error creating new site")
 
@@ -118,6 +118,8 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase):
         self.assertNotIn("No DNS updates needed", out)
         self.assertIn(site_name.lower(), out)
 
-        result = cmd._run("samba-tool %s" % name, 'remove', site_name)
+        result = samba_tool('sites', 'remove', site_name,
+                            outf=StringIO(),
+                            errf=StringIO())
         if result is not None:
             self.fail("Error deleting site")
diff --git a/selftest/flapping.d/samba-tool b/selftest/flapping.d/samba-tool
index 0d6c16d9a33..a5c935c8ea0 100644
--- a/selftest/flapping.d/samba-tool
+++ b/selftest/flapping.d/samba-tool
@@ -1,2 +1 @@
-^samba.tests.blackbox.samba_dnsupdate
 ^samba4.ldap.password_lockout.python