summaryrefslogtreecommitdiff
path: root/source4/torture/drs
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2011-02-21 17:49:54 +0200
committerKamen Mazdrashki <kamenim@samba.org>2011-02-27 00:23:19 +0200
commit90d0d3e5f8ab1c5152163c83e423913a4c24ec9b (patch)
tree0bbbfc621fd7e61c6f345eb2d80551acdcc99c64 /source4/torture/drs
parent1ca2ec1188098c051fe7ab6d44c9b1cd1f802b18 (diff)
downloadsamba-90d0d3e5f8ab1c5152163c83e423913a4c24ec9b.tar.gz
samba-90d0d3e5f8ab1c5152163c83e423913a4c24ec9b.tar.bz2
samba-90d0d3e5f8ab1c5152163c83e423913a4c24ec9b.zip
s4/drs-tests: Move enable/disable replication methods to DrsBase class so we can re-use them
Diffstat (limited to 'source4/torture/drs')
-rw-r--r--source4/torture/drs/python/drs_base.py11
-rw-r--r--source4/torture/drs/python/replica_sync.py12
2 files changed, 11 insertions, 12 deletions
diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py
index 56d1ebe795..8e48b92f7a 100644
--- a/source4/torture/drs/python/drs_base.py
+++ b/source4/torture/drs/python/drs_base.py
@@ -109,3 +109,14 @@ class DrsBaseTestCase(samba.tests.BlackboxTestCase):
cmd_line = "%s %s %s %s" % (samba_tool_cmdline, DC, fromDC, nc_dn)
return self.check_output(cmd_line)
+ def _enable_inbound_repl(self, DC):
+ # make base command line
+ samba_tool_cmd = self._samba_tool_cmdline("options")
+ # disable replication
+ self.check_run("%s %s --dsa-option=-DISABLE_INBOUND_REPL" %(samba_tool_cmd, DC))
+
+ def _disable_inbound_repl(self, DC):
+ # make base command line
+ samba_tool_cmd = self._samba_tool_cmdline("options")
+ # disable replication
+ self.check_run("%s %s --dsa-option=+DISABLE_INBOUND_REPL" %(samba_tool_cmd, DC))
diff --git a/source4/torture/drs/python/replica_sync.py b/source4/torture/drs/python/replica_sync.py
index 5410ed68b2..06502d6008 100644
--- a/source4/torture/drs/python/replica_sync.py
+++ b/source4/torture/drs/python/replica_sync.py
@@ -58,18 +58,6 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
self._enable_inbound_repl(self.dnsname_dc1)
super(DrsReplicaSyncTestCase, self).tearDown()
- def _enable_inbound_repl(self, DC):
- # make base command line
- samba_tool_cmd = self._samba_tool_cmdline("options")
- # disable replication
- self.check_run("%s %s --dsa-option=-DISABLE_INBOUND_REPL" %(samba_tool_cmd, DC))
-
- def _disable_inbound_repl(self, DC):
- # make base command line
- samba_tool_cmd = self._samba_tool_cmdline("options")
- # disable replication
- self.check_run("%s %s --dsa-option=+DISABLE_INBOUND_REPL" %(samba_tool_cmd, DC))
-
def test_ReplEnabled(self):
"""Tests we can replicate when replication is enabled"""
self._enable_inbound_repl(self.dnsname_dc1)