pytest samba-tool forest: use runcmd

This is an example/test to show how runsublevelcmd() converts into
runcmd() whilst ensuring it works.

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

diff --git a/python/samba/tests/samba_tool/forest.py b/python/samba/tests/samba_tool/forest.py
index f5cb3c0312680bd1b9f61f500b73a190dd8bb418..25eeb4ccedb793f15782189f47392f29e640b26a 100644 (file)
--- a/python/samba/tests/samba_tool/forest.py
+++ b/python/samba/tests/samba_tool/forest.py
@@ -43,11 +43,12 @@ class ForestCmdTestCase(SambaToolCmdTest):
 
     def test_display(self):
         """Tests that we can display forest settings"""
-        (result, out, err) = self.runsublevelcmd("forest", ("directory_service",
-                                                            "show"),
-                                                 "-H", "ldap://%s" % os.environ["DC_SERVER"],
-                                                 "-U%s%%%s" % (os.environ["DC_USERNAME"],
-                                                               os.environ["DC_PASSWORD"]))
+        (result, out, err) = self.runcmd("forest",
+                                         "directory_service",
+                                         "show",
+                                         "-H", "ldap://%s" % os.environ["DC_SERVER"],
+                                         "-U%s%%%s" % (os.environ["DC_USERNAME"],
+                                                       os.environ["DC_PASSWORD"]))
 
         self.assertCmdSuccess(result, out, err)
         self.assertEqual(err, "", "Shouldn't be any error messages")
@@ -56,11 +57,13 @@ class ForestCmdTestCase(SambaToolCmdTest):
     def test_modify_dsheuristics(self):
         """Test that we can modify the dsheuristics setting"""
 
-        (result, out, err) = self.runsublevelcmd("forest", ("directory_service",
-                                                            "dsheuristics"), "0000002",
-                                                 "-H", "ldap://%s" % os.environ["DC_SERVER"],
-                                                 "-U%s%%%s" % (os.environ["DC_USERNAME"],
-                                                               os.environ["DC_PASSWORD"]))
+        (result, out, err) = self.runcmd("forest",
+                                         "directory_service",
+                                         "dsheuristics",
+                                         "0000002",
+                                         "-H", "ldap://%s" % os.environ["DC_SERVER"],
+                                         "-U%s%%%s" % (os.environ["DC_USERNAME"],
+                                                       os.environ["DC_PASSWORD"]))
 
         self.assertCmdSuccess(result, out, err)
         self.assertEqual(err, "", "Shouldn't be any error messages")