From 470ea3da1fcfb1b9cf487f5357437aa74f4c93a1 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Fri, 5 Aug 2016 20:10:04 +0000 Subject: [PATCH] YARN-4573. Fix test failure in TestRMAppTransitions#testAppRunningKill and testAppKilledKilled. (Takashi Ohnishi via rohithsharmaks) (cherry picked from commit c01bee010832ca31d8e60e5461181cdf05140602) Conflicts: hadoop-yarn-project/CHANGES.txt --- .../resourcemanager/rmapp/TestRMAppTransitions.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java index f2f09de98a8..293c0b6a4cb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java @@ -275,7 +275,7 @@ protected RMApp createNewTestApp(ApplicationSubmissionContext submissionContext) // 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 @@ private static void testAppStartState(ApplicationId applicationId, // 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 @@ private static void assertFinalAppStatus(FinalApplicationStatus status, RMApp ap // 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 @@ private void sendAttemptUpdateSavedEvent(RMApp application) { application.getCurrentAppAttempt().handle( new RMAppAttemptEvent(application.getCurrentAppAttempt().getAppAttemptId(), RMAppAttemptEventType.ATTEMPT_UPDATE_SAVED)); + rmDispatcher.await(); } protected RMApp testCreateAppNewSaving(