PEP8: fix E127: continuation line over-indented for visual indent

[sfrench/samba-autobuild/.git] / source4 / torture / drs / python / delete_object.py

diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py
index cd7357175d19ef3f737b8c638b847de31fa28a2f..4cbe2e858d71ad8092a7bfd232cb50bfb5671647 100644 (file)
--- a/source4/torture/drs/python/delete_object.py
+++ b/source4/torture/drs/python/delete_object.py
@@ -26,12 +26,13 @@
 #  PYTHONPATH="$PYTHONPATH:$samba4srcdir/torture/drs/python" $SUBUNITRUN delete_object -U"$DOMAIN/$DC_USERNAME"%"$DC_PASSWORD"
 #
 
+from __future__ import print_function
 import time
 
 
 from ldb import (
     SCOPE_SUBTREE,
-    )
+)
 
 import drs_base, ldb
 
@@ -40,16 +41,16 @@ class DrsDeleteObjectTestCase(drs_base.DrsBaseTestCase):
 
     def setUp(self):
         super(DrsDeleteObjectTestCase, self).setUp()
+        # disable automatic replication temporary
+        self._disable_all_repl(self.dnsname_dc1)
+        self._disable_all_repl(self.dnsname_dc2)
         # make sure DCs are synchronized before the test
         self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True)
         self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True)
-        # disable automatic replication temporary
-        self._disable_inbound_repl(self.dnsname_dc1)
-        self._disable_inbound_repl(self.dnsname_dc2)
 
     def tearDown(self):
-        self._enable_inbound_repl(self.dnsname_dc1)
-        self._enable_inbound_repl(self.dnsname_dc2)
+        self._enable_all_repl(self.dnsname_dc1)
+        self._enable_all_repl(self.dnsname_dc2)
         super(DrsDeleteObjectTestCase, self).tearDown()
 
     def _make_username(self):
@@ -121,7 +122,7 @@ class DrsDeleteObjectTestCase(drs_base.DrsBaseTestCase):
         user_dn   = ldb_res[0]["dn"]
 
         # check user info on DC1
-        print "Testing for %s with GUID %s" % (username, self._GUID_string(user_orig["objectGUID"][0]))
+        print("Testing for %s with GUID %s" % (username, self._GUID_string(user_orig["objectGUID"][0])))
         self._check_obj(sam_ldb=self.ldb_dc1, obj_orig=user_orig, is_deleted=False)
 
         # trigger replication from DC1 to DC2
@@ -159,7 +160,7 @@ class DrsDeleteObjectTestCase(drs_base.DrsBaseTestCase):
         m = ldb.Message()
         m.dn = group_dn
         m["member"] = ldb.MessageElement(str(user_dn),
-                                           ldb.FLAG_MOD_ADD, "member")
+                                         ldb.FLAG_MOD_ADD, "member")
         self.ldb_dc2.modify(m)
 
         ldb_res = self.ldb_dc2.search(base=self.domain_dn,
@@ -277,7 +278,7 @@ class DrsDeleteObjectTestCase(drs_base.DrsBaseTestCase):
         user_dn   = ldb_res[0]["dn"]
 
         # check user info on DC1
-        print "Testing for %s with GUID %s" % (username, self._GUID_string(user_orig["objectGUID"][0]))
+        print("Testing for %s with GUID %s" % (username, self._GUID_string(user_orig["objectGUID"][0])))
         self._check_obj(sam_ldb=self.ldb_dc1, obj_orig=user_orig, is_deleted=False)
 
         # trigger replication from DC1 to DC2
@@ -315,7 +316,7 @@ class DrsDeleteObjectTestCase(drs_base.DrsBaseTestCase):
         m = ldb.Message()
         m.dn = group_dn
         m["member"] = ldb.MessageElement(str(user_dn),
-                                           ldb.FLAG_MOD_ADD, "member")
+                                         ldb.FLAG_MOD_ADD, "member")
         self.ldb_dc2.modify(m)
 
         ldb_res = self.ldb_dc2.search(base=self.domain_dn,