From 6294486490460e535f37e0d6e0e929082fda9e3d Mon Sep 17 00:00:00 2001 From: Moiz Raja Date: Fri, 13 Nov 2015 13:32:13 -0800 Subject: [PATCH] Fix failure of testCloseCandidateRegistrationInQuickSuccession Moved checking of whether the ownershipchange event occurred with hasOwner=false to the loop so that we pass the test only when all listeners receive that event with hasOwner=false Change-Id: I463272822e6a39f310fef5996b541e1d06c79548 Signed-off-by: Moiz Raja --- .../DistributedEntityOwnershipIntegrationTest.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 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 69cf4e0ff9..9572b3dd60 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 @@ -8,7 +8,6 @@ package org.opendaylight.controller.cluster.datastore.entityownership; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.AdditionalMatchers.or; import static org.mockito.Mockito.atMost; @@ -305,17 +304,16 @@ public class DistributedEntityOwnershipIntegrationTest { Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); if(!leaderEntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() && !follower1EntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() && - !follower2EntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner()) { + !follower2EntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() && + leaderChangeCaptor.getValue() != null && !leaderChangeCaptor.getValue().hasOwner() && + follower1ChangeCaptor.getValue() != null && !follower1ChangeCaptor.getValue().hasOwner() && + follower2ChangeCaptor.getValue() != null && !follower2ChangeCaptor.getValue().hasOwner()) { passed = true; break; } } assertTrue("No ownership change message was sent with hasOwner=false", passed); - - assertFalse(leaderChangeCaptor.getAllValues().get(leaderChangeCaptor.getAllValues().size()-1).hasOwner()); - assertFalse(follower1ChangeCaptor.getAllValues().get(follower1ChangeCaptor.getAllValues().size()-1).hasOwner()); - assertFalse(follower2ChangeCaptor.getAllValues().get(follower2ChangeCaptor.getAllValues().size()-1).hasOwner()); } private void verifyGetOwnershipState(DistributedEntityOwnershipService service, Entity entity, -- 2.36.6