removed lenient strictness and the unstubbed lines

Change-Id: Idd52f05750eaedaacc009ed8a5fc0dc645351714

Author: susheel-gupta

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapred/TestTaskAttemptListenerImpl.java

@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReference;
@@ -79,7 +78,6 @@
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -262,12 +260,6 @@ public void testGetMapCompletionEvents() throws IOException {
         createTce(3, false, TaskAttemptCompletionEventStatus.FAILED) };
     TaskAttemptCompletionEvent[] mapEvents = { taskEvents[0], taskEvents[2] };
     Job mockJob = mock(Job.class);
-    lenient().when(mockJob.getTaskAttemptCompletionEvents(0, 100))
-        .thenReturn(taskEvents);
-    lenient().when(mockJob.getTaskAttemptCompletionEvents(0, 2))
-        .thenReturn(Arrays.copyOfRange(taskEvents, 0, 2));
-    lenient().when(mockJob.getTaskAttemptCompletionEvents(2, 100))
-        .thenReturn(Arrays.copyOfRange(taskEvents, 2, 4));
     when(mockJob.getMapAttemptCompletionEvents(0, 100)).thenReturn(
         TypeConverter.fromYarn(mapEvents));
     when(mockJob.getMapAttemptCompletionEvents(0, 2)).thenReturn(

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestMapReduceChildJVM.java

@@ -48,6 +48,7 @@ public class TestMapReduceChildJVM {
       LoggerFactory.getLogger(TestMapReduceChildJVM.class);
 
   @Test
+  @Timeout(30000)
   public void testCommandLine() throws Exception {
     MyMRApp app = new MyMRApp(1, 0, true, this.getClass().getName(), true);
     Configuration conf = new Configuration();

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMCommunicator.java

@@ -69,6 +69,7 @@ public void testRMContainerAllocatorExceptionIsHandled() throws Exception {
   }
 
   @Test
+  @Timeout(2000)
   public void testRMContainerAllocatorYarnRuntimeExceptionIsHandled()
       throws Exception {
     ClientService mockClientService = mock(ClientService.class);