Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
(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
This commit is contained in:
Jason Lowe 2017-03-10 13:05:55 -06:00
parent 5c14eb6f18
commit dd7c688a94
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
View File

@ -28,7 +28,7 @@ public Resource createResource(long memory, int vCores) {
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 void testCompareToWithUnboundedResource() {
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 void testCompareToWithNoneResource() {
assertTrue(Resources.none().compareTo(
createResource(0, 1)) < 0);
}
}

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resource/TestResources.java
View File

@ -22,7 +22,7 @@
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 void testFitsIn() {
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)));