summaryrefslogtreecommitdiff
path: root/source4/torture/drs
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2017-07-06 16:01:56 +1200
committerAndrew Bartlett <abartlet@samba.org>2017-07-28 00:25:14 +0200
commitcc3d83677bdf7330aa37e47ce95cf26546b90ad5 (patch)
tree23e82838e77d2ff9283b4038d32d2b1315f1c0da /source4/torture/drs
parent09ce35ecf30863e131401c9d8d58274402d427c1 (diff)
downloadsamba-cc3d83677bdf7330aa37e47ce95cf26546b90ad5.tar.gz
selftest: Port DrsBaseTestCase._enable_inbound_repl() to self.runsubcmd()
This avoids forking a subprocess with self.check_run() Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'source4/torture/drs')
-rw-r--r--source4/torture/drs/python/drs_base.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py
index 87036178375..5ddd2a79ffe 100644
--- a/source4/torture/drs/python/drs_base.py
+++ b/source4/torture/drs/python/drs_base.py
@@ -137,9 +137,12 @@ class DrsBaseTestCase(SambaToolCmdTest):
def _enable_inbound_repl(self, DC):
# make base command line
- samba_tool_cmd = self._samba_tool_cmdline("options")
+ samba_tool_cmd = self._samba_tool_cmd_list("options")
# disable replication
- self.check_run("%s %s --dsa-option=-DISABLE_INBOUND_REPL" %(samba_tool_cmd, DC))
+ samba_tool_cmd += [DC, "--dsa-option=-DISABLE_INBOUND_REPL"]
+ (result, out, err) = self.runsubcmd(*samba_tool_cmd)
+ self.assertCmdSuccess(result, out, err)
+ self.assertEquals(err,"","Shouldn't be any error messages")
def _disable_inbound_repl(self, DC):
# make base command line