YARN-5622. TestYarnCLI.testGetContainers fails due to mismatched date formats. Contributed by Eric Badger.
This commit is contained in:
parent
a5bb88c8e0
commit
6e849cb658
@ -35,8 +35,6 @@
|
||||
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.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 void testGetContainers() throws Exception {
|
||||
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 void testGetContainers() throws Exception {
|
||||
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");
|
||||
|
Loading…
Reference in New Issue
Block a user