Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 5c14eb6f1 -> dd7c688a9
YARN-6321. TestResources test timeouts are too aggressive. Contributed by Eric
Badger
(cherry picked from commit 9649c27864a23ea156bae904368c1d3cf94c6e9d)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd7c688a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd7c688a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd7c688a
Branch: refs/heads/branch-2.8
Commit: dd7c688a94b54dbbd9e6c6c4259e616ac1de6d7a
Parents: 5c14eb6
Author: Jason Lowe <[email protected]>
Authored: Fri Mar 10 13:05:55 2017 -0600
Committer: Jason Lowe <[email protected]>
Committed: Fri Mar 10 13:09:20 2017 -0600
----------------------------------------------------------------------
.../org/apache/hadoop/yarn/util/resource/TestResources.java | 5 ++---
.../yarn/server/resourcemanager/resource/TestResources.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd7c688a/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 057214b..636e538 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
@@ -28,7 +28,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);
@@ -38,7 +38,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(
@@ -46,5 +46,4 @@ public class TestResources {
assertTrue(Resources.none().compareTo(
createResource(0, 1)) < 0);
}
-
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd7c688a/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: [email protected]
For additional commands, e-mail: [email protected]
