From f9ff50ae7c493f84d9ac7271e86efd7aba2b7ce9 Mon Sep 17 00:00:00 2001 From: Tim Beale Date: Fri, 27 Jul 2018 15:55:36 +1200 Subject: [PATCH] Refactor for PEP8 warning E501 line too long Rename a couple of really long functions. Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- source4/torture/drs/python/link_conflicts.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/source4/torture/drs/python/link_conflicts.py b/source4/torture/drs/python/link_conflicts.py index 4d6f05f41c1..c042858257a 100644 --- a/source4/torture/drs/python/link_conflicts.py +++ b/source4/torture/drs/python/link_conflicts.py @@ -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): """