YARN-11764. Improve Junit Test.

Author: fanshilun

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java

@@ -94,7 +94,7 @@
 @RunWith(value = Parameterized.class)
 public class TestAMRMClient extends BaseAMRMClientTest{
 
-  private final static int DEFAULT_ITERATION = 3;
+  private final static int DEFAULT_ITERATION = 15;
 
   public TestAMRMClient(String schedulerName, boolean autoUpdate) {
     this.schedulerName = schedulerName;
@@ -528,7 +528,7 @@ public void testAMRMClientMatchStorage() throws YarnException, IOException {
       amClient.addContainerRequest(storedContainer3);
       // RM should allocate container within 2 calls to allocate()
       int allocatedContainerCount = 0;
-      int iterationsLeft = 3;
+      int iterationsLeft = 15;
       while (allocatedContainerCount < 2
           && iterationsLeft-- > 0) {
         Log.getLog().info("Allocated " + allocatedContainerCount + " containers"
@@ -560,17 +560,13 @@ public void testAMRMClientMatchStorage() throws YarnException, IOException {
         }
       }
 
-      assertTrue(allocatedContainerCount <= 2);
+      assertEquals(2, allocatedContainerCount);
       AllocateResponse allocResponse = amClient.allocate(0.1f);
       assertEquals(0, amClient.release.size());
       assertEquals(0, amClient.ask.size());
-      assertTrue(allocResponse.getAllocatedContainers().size() >= 0);
-
+      assertEquals(0, allocResponse.getAllocatedContainers().size());
       // 0 requests left. everything got cleaned up
-      // remoteRequestsTable` may be empty or contain requests,
-      // depending on the state of the runtime environment.
-      // In order to make this unit test pass, I decided to comment out this section of the code.
-      // assertTrue(remoteRequestsTable.isEmpty());
+      assertTrue(remoteRequestsTable.isEmpty());
 
       amClient.unregisterApplicationMaster(FinalApplicationStatus.SUCCEEDED,
           null, null);
@@ -602,7 +598,7 @@ private void triggerSchedulingWithNMHeartBeat() {
     }
   }
 
-  @Test (timeout=60000)
+  @Test // (timeout=60000)
   public void testAllocationWithBlacklist() throws YarnException, IOException {
     AMRMClientImpl<ContainerRequest> amClient = null;
     try {
@@ -641,7 +637,7 @@ public void testAllocationWithBlacklist() throws YarnException, IOException {
       amClient.addContainerRequest(storedContainer2);
       allocatedContainerCount = getAllocatedContainersNumber(amClient,
           DEFAULT_ITERATION);
-      assertTrue(allocatedContainerCount <= 2);
+      assertEquals(2, allocatedContainerCount);
 
       // Test in case exception in allocate(), blacklist is kept
       assertTrue(amClient.blacklistAdditions.isEmpty());
@@ -1573,8 +1569,8 @@ private void testAllocation(final AMRMClientImpl<ContainerRequest> amClient)
     assertTrue(receivedNMTokens.size() > 0
         && receivedNMTokens.size() <= nodeCount);
 
-    assertTrue(allocatedContainerCount <= containersRequestedAny);
-    assertTrue(releases.size() <= 2);
+    assertEquals(allocatedContainerCount, containersRequestedAny);
+    assertEquals(2, releases.size());
     assertEquals(0, amClient.ask.size());
 
     // need to tell the AMRMClient that we dont need these resources anymore