From 6e849cb658438c0561de485e01f3de7df47bf9ad Mon Sep 17 00:00:00 2001 From: Kihwal Lee Date: Fri, 23 Sep 2016 14:09:25 -0500 Subject: [PATCH] YARN-5622. TestYarnCLI.testGetContainers fails due to mismatched date formats. Contributed by Eric Badger. --- .../org/apache/hadoop/yarn/client/cli/TestYarnCLI.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java index 3fdea40c316..ef6436534e5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java @@ -35,8 +35,6 @@ import java.io.OutputStreamWriter; import java.io.PrintStream; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.EnumSet; @@ -81,6 +79,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.util.Records; +import org.apache.hadoop.yarn.util.Times; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -300,7 +299,6 @@ public class TestYarnCLI { reports.add(container); reports.add(container1); reports.add(container2); - DateFormat dateFormat=new SimpleDateFormat("EEE MMM dd HH:mm:ss Z yyyy"); when(client.getContainers(any(ApplicationAttemptId.class))).thenReturn( reports); sysOutStream.reset(); @@ -316,13 +314,13 @@ public class TestYarnCLI { pw.printf(ApplicationCLI.CONTAINER_PATTERN, "Container-Id", "Start Time", "Finish Time", "State", "Host", "Node Http Address", "LOG-URL"); pw.printf(ApplicationCLI.CONTAINER_PATTERN, "container_1234_0005_01_000001", - dateFormat.format(new Date(time1)), dateFormat.format(new Date(time2)), + Times.format(time1), Times.format(time2), "COMPLETE", "host:1234", "http://host:2345", "logURL"); pw.printf(ApplicationCLI.CONTAINER_PATTERN, "container_1234_0005_01_000002", - dateFormat.format(new Date(time1)), dateFormat.format(new Date(time2)), + Times.format(time1), Times.format(time2), "COMPLETE", "host:1234", "http://host:2345", "logURL"); pw.printf(ApplicationCLI.CONTAINER_PATTERN, "container_1234_0005_01_000003", - dateFormat.format(new Date(time1)), "N/A", "RUNNING", "host:1234", + Times.format(time1), "N/A", "RUNNING", "host:1234", "http://host:2345", ""); pw.close(); String appReportStr = baos.toString("UTF-8");