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

YARN-4573. Fix test failure in TestRMAppTransitions#testAppRunningKill and testAppKilledKilled. (Takashi Ohnishi via rohithsharmaks) 

(cherry picked from commit c01bee0108)

Conflicts:

	hadoop-yarn-project/CHANGES.txt
This commit is contained in:
Jason Lowe 2016-08-05 20:12:23 +00:00
parent 9669779f2c
commit 7bbd3cf650
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -35,6 +35,9 @@ Release 2.7.4 - UNRELEASED
YARN-5469. Increase timeout of TestAmFilter.testFilter (Eric Badger via
jlowe)
YARN-4573. Fix test failure in TestRMAppTransitions#testAppRunningKill and
testAppKilledKilled. (Takashi Ohnishi via rohithsharmaks)
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES

9
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java
View File

@ -275,7 +275,7 @@ public class TestRMAppTransitions {
// Test expected newly created app state
private static void testAppStartState(ApplicationId applicationId,
String user, String name, String queue, RMApp application) {
Assert.assertTrue("application start time is not greater then 0",
Assert.assertTrue("application start time is not greater than 0",
application.getStartTime() > 0);
Assert.assertTrue("application start time is before currentTime",
application.getStartTime() <= System.currentTimeMillis());
@ -300,7 +300,7 @@ public class TestRMAppTransitions {
// test to make sure times are set when app finishes
private static void assertStartTimeSet(RMApp application) {
Assert.assertTrue("application start time is not greater then 0",
Assert.assertTrue("application start time is not greater than 0",
application.getStartTime() > 0);
Assert.assertTrue("application start time is before currentTime",
application.getStartTime() <= System.currentTimeMillis());
@ -319,9 +319,9 @@ public class TestRMAppTransitions {
// test to make sure times are set when app finishes
private void assertTimesAtFinish(RMApp application) {
assertStartTimeSet(application);
Assert.assertTrue("application finish time is not greater then 0",
Assert.assertTrue("application finish time is not greater than 0",
(application.getFinishTime() > 0));
Assert.assertTrue("application finish time is not >= then start time",
Assert.assertTrue("application finish time is not >= than start time",
(application.getFinishTime() >= application.getStartTime()));
}
@ -364,6 +364,7 @@ public class TestRMAppTransitions {
application.getCurrentAppAttempt().handle(
new RMAppAttemptEvent(application.getCurrentAppAttempt().getAppAttemptId(),
RMAppAttemptEventType.ATTEMPT_UPDATE_SAVED));
rmDispatcher.await();
}
protected RMApp testCreateAppNewSaving(