Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sorted Strings to Fix test flakiness in testHumanPrinterAll #1

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Sorted Strings to Fix test flakiness in testHumanPrinterAll #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ...t-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.hadoop.mapreduce.JobID;
import org.apache.hadoop.mapreduce.JobStatus;
import org.apache.hadoop.mapreduce.TaskType;
import org.assertj.core.api.Assertions;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
Expand All @@ -35,7 +36,9 @@

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.TimeZone;
import java.util.Locale;

Expand Down Expand Up @@ -160,6 +163,13 @@ public void testHumanPrinter() throws Exception {
LINE_SEPARATOR, outStr);
}

private static void assertEqualLines(String str1, String str2) {
final List<String> linesFromStr1 = Arrays.asList(str1.trim().split("\n"));
final List<String> linesFromStr2 = Arrays.asList(str2.trim().split("\n"));

Assertions.assertThat(linesFromStr1).containsExactlyInAnyOrderElementsOf(linesFromStr2);
}

@Test
public void testHumanPrinterAll() throws Exception {
JobHistoryParser.JobInfo job = createJobInfo();
Expand All @@ -168,7 +178,7 @@ public void testHumanPrinterAll() throws Exception {
TimeZone.getTimeZone("GMT"));
String outStr = run(printer);
if (System.getProperty("java.version").startsWith("1.7")) {
Assert.assertEquals("\n" +
assertEqualLines("\n" +
"Hadoop job: job_1317928501754_0001\n" +
"=====================================\n" +
"User: rkanter\n" +
Expand Down Expand Up @@ -356,7 +366,7 @@ public void testHumanPrinterAll() throws Exception {
"localhost\ttask_1317928501754_0001_m_000002, " +
LINE_SEPARATOR, outStr);
} else {
Assert.assertEquals("\n" +
assertEqualLines("\n" +
"Hadoop job: job_1317928501754_0001\n" +
"=====================================\n" +
"User: rkanter\n" +
Expand Down