diff options
author | Andrew Bartlett <abartlet@samba.org> | 2017-07-06 16:09:54 +1200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2017-07-28 00:25:14 +0200 |
commit | f7c46ed56c1473f3faa58a4e3e588451b84776b2 (patch) | |
tree | a479fa062a32436c36b2bb7a713163a12e751955 /source4/torture/drs | |
parent | cc3d83677bdf7330aa37e47ce95cf26546b90ad5 (diff) | |
download | samba-f7c46ed56c1473f3faa58a4e3e588451b84776b2.tar.gz |
selftest: Port DrsBaseTestCase._disable_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.py | 7 |
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 5ddd2a79ffe..03131d7a74d 100644 --- a/source4/torture/drs/python/drs_base.py +++ b/source4/torture/drs/python/drs_base.py @@ -146,9 +146,12 @@ class DrsBaseTestCase(SambaToolCmdTest): def _disable_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 _enable_all_repl(self, DC): # make base command line |