From bdb05a6dcc492c8e5b3e6b010769397868b4a2d4 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Fri, 11 Sep 2015 20:32:55 -0400 Subject: [PATCH] Bug 4105: Fix intermittent failure in DistributedEntityOwnershipIntegrationTest I saw a test filure on jenkins. After follower2 is stopped there will be 2 onOwnershipChange calls so the test needs to expect both. Change-Id: I74dc583c2d40e966197315640eb189702fbabd64 Signed-off-by: Tom Pantelis (cherry picked from commit a3a0417b0ee75f040fb4436602ed7ecf5585d44f) --- .../DistributedEntityOwnershipIntegrationTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 108e0c5c6e..0ea7b7536c 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,6 +8,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.reset; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; @@ -231,9 +232,10 @@ public class DistributedEntityOwnershipIntegrationTest { reset(leaderMockListener, follower1MockListener); JavaTestKit.shutdownActorSystem(follower2System); - verify(follower1MockListener, timeout(15000)).ownershipChanged(ownershipChange(ENTITY4, false, true, true)); - verify(leaderMockListener, timeout(15000)).ownershipChanged(ownershipChange(ENTITY4, false, false, true)); - verify(leaderMockListener, timeout(15000)).ownershipChanged(ownershipChange(ENTITY2, false, false, false)); + verify(follower1MockListener, timeout(15000).times(2)).ownershipChanged(or(ownershipChange(ENTITY4, false, true, true), + ownershipChange(ENTITY2, false, false, false))); + verify(leaderMockListener, timeout(15000).times(2)).ownershipChanged(or(ownershipChange(ENTITY4, false, false, true), + ownershipChange(ENTITY2, false, false, false))); verifyOwner(leaderDistributedDataStore, ENTITY2, ""); // no other candidate // Register leader candidate for entity2 and verify it becomes owner -- 2.36.6