From 91063c9926e732ac41b29cf24c43c2c22fb93e43 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Tue, 6 Oct 2015 09:43:55 -0400 Subject: [PATCH] Fix DistributedEntityOwnershipIntegrationTest failure Fixed intermittent failure due the follower2MockListener getting an ownershipChanged with "false, false, true" if if the original ownership change with "member-2 is replicated to follower2 after the listener is registered. The test ran 100 times successfully. Change-Id: I1f0333e3bc69cc28521bc7388d64b56d18b55544 Signed-off-by: Tom Pantelis (cherry picked from commit de587f935016a300cdbeb85926c2eb677f383fc2) --- .../DistributedEntityOwnershipIntegrationTest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java index 0ea7b7536c..1bb579848d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.cluster.datastore.entityownership; import static org.junit.Assert.assertEquals; import static org.mockito.AdditionalMatchers.or; +import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; @@ -198,11 +199,17 @@ public class DistributedEntityOwnershipIntegrationTest { // Unregister follower1 candidate for entity2 and verify follower2 becomes owner follower1EntityOwnershipService.unregisterCandidate(ENTITY2); + verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-3"); verifyOwner(leaderDistributedDataStore, ENTITY2, "member-3"); - verify(follower2MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, true, true)); verify(follower1MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, true, false, true)); verify(leaderMockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, false, true)); - verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-3"); + + // Depending on timing, follower2MockListener could get ownershipChanged with "false, false, true" if + // if the original ownership change with "member-2 is replicated to follower2 after the listener is + // registered. + Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS); + verify(follower2MockListener, atMost(1)).ownershipChanged(ownershipChange(ENTITY2, false, false, true)); + verify(follower2MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, true, true)); // Register follower1 candidate for entity3 and verify it becomes owner -- 2.36.6