YARN-6321. TestResources test timeouts are too aggressive. Contributed by Eric 
Badger


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9649c278
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9649c278
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9649c278

Branch: refs/heads/HADOOP-13345
Commit: 9649c27864a23ea156bae904368c1d3cf94c6e9d
Parents: 092ec39
Author: Jason Lowe <jl...@yahoo-inc.com>
Authored: Fri Mar 10 13:05:55 2017 -0600
Committer: Jason Lowe <jl...@yahoo-inc.com>
Committed: Fri Mar 10 13:06:54 2017 -0600

----------------------------------------------------------------------
 .../org/apache/hadoop/yarn/util/resource/TestResources.java    | 6 +++---
 .../yarn/server/resourcemanager/resource/TestResources.java    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9649c278/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
index f8570a8..d79179a 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
@@ -30,7 +30,7 @@ public class TestResources {
     return Resource.newInstance(memory, vCores);
   }
 
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testCompareToWithUnboundedResource() {
     assertTrue(Resources.unbounded().compareTo(
             createResource(Long.MAX_VALUE, Integer.MAX_VALUE)) == 0);
@@ -40,7 +40,7 @@ public class TestResources {
         createResource(0, Integer.MAX_VALUE)) > 0);
   }
 
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testCompareToWithNoneResource() {
     assertTrue(Resources.none().compareTo(createResource(0, 0)) == 0);
     assertTrue(Resources.none().compareTo(
@@ -49,7 +49,7 @@ public class TestResources {
         createResource(0, 1)) < 0);
   }
 
-  @Test
+  @Test(timeout=10000)
   public void testMultipleRoundUp() {
     final double by = 0.5;
     final String memoryErrorMsg = "Invalid memory size.";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9649c278/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resource/TestResources.java
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resource/TestResources.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resource/TestResources.java
index ae98660..2a10747 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resource/TestResources.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resource/TestResources.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 
 public class TestResources {
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testFitsIn() {
     assertTrue(fitsIn(createResource(1, 1), createResource(2, 2)));
     assertTrue(fitsIn(createResource(2, 2), createResource(2, 2)));
@@ -31,7 +31,7 @@ public class TestResources {
     assertFalse(fitsIn(createResource(2, 1), createResource(1, 2)));
   }
   
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testComponentwiseMin() {
     assertEquals(createResource(1, 1),
         componentwiseMin(createResource(1, 1), createResource(2, 2)));


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to