Repository: incubator-geode Updated Branches: refs/heads/develop 366f0894e -> 665570e43
GEODE-2074 GMSJoinLeaveJUnitTest.testDuplicateJoinRequestDoesNotCauseNewView I've run this test class hundreds of times with only one failure in a different test. I've also run the individual test many hundreds of times with no failures. Since the ticket didn't include any of the test output or any information about past tests run that could have affected this test I am closing the ticket and modifying the test's failure text to give more information about the state of the Join/Leave processor if the test should fail again. This commit also includes a fix for the other test method that failed. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/665570e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/665570e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/665570e4 Branch: refs/heads/develop Commit: 665570e438386a11f2071160e14ef3861bbfba51 Parents: 366f089 Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Mon Nov 14 10:06:42 2016 -0800 Committer: Bruce Schuchardt <bschucha...@pivotal.io> Committed: Mon Nov 14 10:10:57 2016 -0800 ---------------------------------------------------------------------- .../membership/gms/membership/GMSJoinLeaveJUnitTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/665570e4/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java index dac49d5..4143be1 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java @@ -487,7 +487,7 @@ public class GMSJoinLeaveJUnitTest { view.getCrashedMembers().contains(mockMembers[0])); } - @Category(FlakyTest.class) // GEODE-2074: timed out waiting for view #7 +// @Category(FlakyTest.class) // GEODE-2074: timed out waiting for view #7 @Test public void testDuplicateJoinRequestDoesNotCauseNewView() throws Exception { initMocks(); @@ -532,9 +532,9 @@ public class GMSJoinLeaveJUnitTest { && (!gmsJoinLeave.getViewRequests().isEmpty() || gmsJoinLeave.getView().getViewId() != viewId)) { if (sleeps++ > 20) { - System.out.println("view requests: " + gmsJoinLeave.getViewRequests()); - System.out.println("current view: " + gmsJoinLeave.getView()); - throw new RuntimeException("timeout waiting for view #" + viewId); + throw new RuntimeException( + "timeout waiting for view #" + viewId + " current view: " + gmsJoinLeave.getView() + + "; view requests: " + gmsJoinLeave.getViewRequests()); } Thread.sleep(1000); } @@ -1030,7 +1030,7 @@ public class GMSJoinLeaveJUnitTest { msg.setSender(gmsJoinLeaveMemberId); gmsJoinLeave.processMessage(msg); } - Timeout to = new Timeout(2 * ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL, new Times(1)); + Timeout to = new Timeout(3 * ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL, new Times(1)); verify(messenger, to).send(isA(NetworkPartitionMessage.class)); } finally {