Refactor for PEP8 warning E501 line too long
authorTim Beale <timbeale@catalyst.net.nz>
Fri, 27 Jul 2018 03:55:36 +0000 (15:55 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 17 Aug 2018 00:58:28 +0000 (02:58 +0200)
Rename a couple of really long functions.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
source4/torture/drs/python/link_conflicts.py

index 4d6f05f41c1caebd3f29e26319c50b90739a99d8..c042858257a210a604fe81a577d76fde67ecf768 100644 (file)
@@ -572,7 +572,7 @@ class DrsReplicaLinkConflictTestCase(drs_base.DrsBaseTestCase):
         self._test_full_sync_link_conflict(sync_order=DC1_TO_DC2)
         self._test_full_sync_link_conflict(sync_order=DC2_TO_DC1)
 
-    def _test_conflict_single_valued_link_deleted_winner(self, sync_order):
+    def _singleval_link_conflict_deleted_winner(self, sync_order):
         """
         Tests a single-value link conflict where the more-up-to-date link value
         is deleted.
@@ -619,11 +619,12 @@ class DrsReplicaLinkConflictTestCase(drs_base.DrsBaseTestCase):
         self._check_replicated_links(src_ou, [link1, link2])
 
     def test_conflict_single_valued_link_deleted_winner(self):
-        # repeat the test twice, to give each DC a chance to resolve the conflict
-        self._test_conflict_single_valued_link_deleted_winner(sync_order=DC1_TO_DC2)
-        self._test_conflict_single_valued_link_deleted_winner(sync_order=DC2_TO_DC1)
+        # repeat the test twice, to give each DC a chance to resolve
+        # the conflict
+        self._singleval_link_conflict_deleted_winner(sync_order=DC1_TO_DC2)
+        self._singleval_link_conflict_deleted_winner(sync_order=DC2_TO_DC1)
 
-    def _test_conflict_single_valued_link_deleted_loser(self, sync_order):
+    def _singleval_link_conflict_deleted_loser(self, sync_order):
         """
         Tests a single-valued link conflict, where the losing link value is
         deleted.
@@ -673,9 +674,10 @@ class DrsReplicaLinkConflictTestCase(drs_base.DrsBaseTestCase):
         self._check_replicated_links(src_ou, [link1, link2])
 
     def test_conflict_single_valued_link_deleted_loser(self):
-        # repeat the test twice, to give each DC a chance to resolve the conflict
-        self._test_conflict_single_valued_link_deleted_loser(sync_order=DC1_TO_DC2)
-        self._test_conflict_single_valued_link_deleted_loser(sync_order=DC2_TO_DC1)
+        # repeat the test twice, to give each DC a chance to resolve
+        # the conflict
+        self._singleval_link_conflict_deleted_loser(sync_order=DC1_TO_DC2)
+        self._singleval_link_conflict_deleted_loser(sync_order=DC2_TO_DC1)
 
     def _test_conflict_existing_single_valued_link(self, sync_order):
         """