Ocasional race condition in upgrade junits

Issue-ID: POLICY-2158
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I5b1295508a291338d0ea668f598ce038304a35bc

diff --git a/policy-management/src/test/java/org/onap/policy/drools/controller/internal/MavenDroolsControllerUpgradesTest.java b/policy-management/src/test/java/org/onap/policy/drools/controller/internal/MavenDroolsControllerUpgradesTest.java
index 8c8cf97..aa4b2c6 100644 (file)
--- a/policy-management/src/test/java/org/onap/policy/drools/controller/internal/MavenDroolsControllerUpgradesTest.java
+++ b/policy-management/src/test/java/org/onap/policy/drools/controller/internal/MavenDroolsControllerUpgradesTest.java
@@ -150,8 +150,9 @@ public class MavenDroolsControllerUpgradesTest {
 
         assertTrue(running2a.await(30, TimeUnit.SECONDS));
         assertTrue(running2b.await(30, TimeUnit.SECONDS));
+        assertTrue(running1b.await(30, TimeUnit.SECONDS));
         summary();
-        assertKie(Arrays.asList("run-drools-runnable", "SETUP.1", "VERSION.12", "SETUP.2", "VERSION.2"), 2);
+        assertKie(Arrays.asList("run-drools-runnable", "SETUP.1", "VERSION.12", "SETUP.2", "VERSION.2"), 1);
 
         controller.updateToVersion(
             rulesDescriptor1.getGroupId(),
@@ -159,7 +160,6 @@ public class MavenDroolsControllerUpgradesTest {
             rulesDescriptor1.getVersion(),
             null, null);
 
-        assertTrue(running1b.await(30, TimeUnit.SECONDS));
         summary();
         assertKie(Arrays.asList("run-drools-runnable", "SETUP.1", "VERSION.12"), 1);
     }