From bbcfe327e3493d2c83c1276da6368f447fdf617c Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@yahoo-inc.com>
Date: Wed, 10 May 2017 09:57:41 -0500
Subject: [PATCH] MAPREDUCE-6882. Increase MapReduce test timeouts from 1
 second to 10 seconds. Contributed by Eric Badger

---
 .../org/apache/hadoop/mapred/TestMRWithDistributedCache.java  | 2 +-
 .../src/test/java/org/apache/hadoop/mapred/TestClock.java     | 2 +-
 .../test/java/org/apache/hadoop/mapred/TestClusterStatus.java | 4 ++--
 .../src/test/java/org/apache/hadoop/mapred/TestJobConf.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java
index 02fe60b297a..341f38dbdcf 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java
@@ -223,7 +223,7 @@ public class TestMRWithDistributedCache extends TestCase {
     return p;
   }
 
-  @Test (timeout = 1000)
+  @Test (timeout = 10000)
   public void testDeprecatedFunctions() throws Exception {
     DistributedCache.addLocalArchives(conf, "Test Local Archives 1");
     Assert.assertEquals("Test Local Archives 1",
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClock.java
index 7081cd5a154..70016bfe6d0 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClock.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.*;
  */
 public class TestClock {
 
-  @Test  (timeout=1000)
+  @Test  (timeout=10000)
   public void testClock(){
     Clock clock= new Clock();
     long templateTime=System.currentTimeMillis();
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClusterStatus.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClusterStatus.java
index 08059a08ecd..399e972d921 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClusterStatus.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClusterStatus.java
@@ -26,14 +26,14 @@ public class TestClusterStatus {
   private ClusterStatus clusterStatus = new ClusterStatus();
 
   @SuppressWarnings("deprecation")
-  @Test (timeout = 1000)
+  @Test (timeout = 10000)
   public void testGraylistedTrackers() {
     Assert.assertEquals(0, clusterStatus.getGraylistedTrackers());
     Assert.assertTrue(clusterStatus.getGraylistedTrackerNames().isEmpty());
   }
 
   @SuppressWarnings("deprecation")
-  @Test (timeout = 1000)
+  @Test (timeout = 10000)
   public void testJobTrackerState() {
     Assert.assertEquals(JobTracker.State.RUNNING,
         clusterStatus.getJobTrackerState());
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobConf.java
index 58092f2f60a..a493d167be9 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobConf.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobConf.java
@@ -163,7 +163,7 @@ public class TestJobConf {
    * old property names
    */
   @SuppressWarnings("deprecation")
-  @Test (timeout = 1000)
+  @Test (timeout = 10000)
   public void testDeprecatedPropertyNameForTaskVmem() {
     JobConf configuration = new JobConf();