s4/torture/drs/python: don't double-call enable/disable replication

This is repeating work done in setup/teardown or doubling up in place (self._enable_all_repl includes self._enable_inbound_repl)

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

diff --git a/source4/torture/drs/python/repl_schema.py b/source4/torture/drs/python/repl_schema.py
index 61c08be6db96fde6e48cf75e9f94eed0c3519939..89346af724d7e374cc31c0182ccbea82f0ee5689 100644 (file)
--- a/source4/torture/drs/python/repl_schema.py
+++ b/source4/torture/drs/python/repl_schema.py
@@ -308,9 +308,6 @@ class DrsReplSchemaTestCase(drs_base.DrsBaseTestCase):
 
         This ensures that the server
         """
-        # disable automatic replication temporary
-        self._disable_all_repl(self.dnsname_dc1)
-        self._disable_all_repl(self.dnsname_dc2)
 
        # add new attributeSchema object
         (a_ldn, a_dn) = self._schema_new_attr(self.ldb_dc1, "attr-OU-S", 14)

diff --git a/source4/torture/drs/python/replica_sync_rodc.py b/source4/torture/drs/python/replica_sync_rodc.py
index 907cef49792c765f55c5b30d282e12597e7dbf65..d93c45496473422808046be6d9a20fd271066dd2 100644 (file)
--- a/source4/torture/drs/python/replica_sync_rodc.py
+++ b/source4/torture/drs/python/replica_sync_rodc.py
@@ -43,14 +43,12 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
 
     def setUp(self):
         super(DrsReplicaSyncTestCase, self).setUp()
-        self._disable_inbound_repl(self.dnsname_dc1)
         self._disable_all_repl(self.dnsname_dc1)
         self.ou1 = None
         self.ou2 = None
 
     def tearDown(self):
         # re-enable replication
-        self._enable_inbound_repl(self.dnsname_dc1)
         self._enable_all_repl(self.dnsname_dc1)
 
         super(DrsReplicaSyncTestCase, self).tearDown()