Merge pull request #3984 from fviale/master

Recover tests : add wait method when acquiring nodes

rm/rm-server/src/test/java/functionaltests/nodesrecovery/RecoverDefaultInfrastructureTest.java

@@ -121,6 +121,7 @@ public class RecoverDefaultInfrastructureTest extends RMFunctionalTest {
         RMTHelper.log("Acquiring " + NODE_NUMBER + " nodes with token=" + TOKEN);
         NodeSet nodeSet = this.rmHelper.getResourceManager().getNodes(criteria);
         Assert.assertEquals(NODE_NUMBER, nodeSet.size());
+        this.rmHelper.waitForAnyMultipleNodeEvent(RMEventType.NODE_STATE_CHANGED, NODE_NUMBER);
         this.rmHelper.getResourceManager().releaseNodes(nodeSet);
         this.rmHelper.waitForAnyMultipleNodeEvent(RMEventType.NODE_STATE_CHANGED, NODE_NUMBER);
     }

rm/rm-server/src/test/java/functionaltests/nodesrecovery/RecoverLocalInfrastructureTest.java

@@ -178,6 +178,7 @@ public class RecoverLocalInfrastructureTest extends RMFunctionalTest {
         RMTHelper.log("Acquiring " + NODE_NUMBER + " nodes with token=" + TOKEN);
         NodeSet nodeSet = this.rmHelper.getResourceManager().getNodes(criteria);
         Assert.assertEquals(NODE_NUMBER, nodeSet.size());
+        this.rmHelper.waitForAnyMultipleNodeEvent(RMEventType.NODE_STATE_CHANGED, NODE_NUMBER);
         this.rmHelper.getResourceManager().releaseNodes(nodeSet);
         this.rmHelper.waitForAnyMultipleNodeEvent(RMEventType.NODE_STATE_CHANGED, NODE_NUMBER);
     }