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

HDFS-7328. TestTraceAdmin assumes Unix line endings. Contributed by Chris Nauroth. 

(cherry picked from commit 2bb327eb93)
(cherry picked from commit 5720cc9d2d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java
This commit is contained in:
cnauroth 2014-11-03 19:59:52 -08:00
parent 0b73606b1c
commit ff361e7c31
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -1074,6 +1074,8 @@ Release 2.6.0 - UNRELEASED
HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha) HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)
HDFS-7328. TestTraceAdmin assumes Unix line endings. (cnauroth)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

9
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java
View File

@ -28,6 +28,7 @@ import java.io.File;
import java.io.PrintStream; import java.io.PrintStream;
public class TestTraceAdmin { public class TestTraceAdmin {
private static final String NEWLINE = System.getProperty("line.separator");
private String runTraceCommand(TraceAdmin trace, String... cmd) private String runTraceCommand(TraceAdmin trace, String... cmd)
throws Exception { throws Exception {
@ -66,10 +67,10 @@ public class TestTraceAdmin {
try { try {
TraceAdmin trace = new TraceAdmin(); TraceAdmin trace = new TraceAdmin();
trace.setConf(conf); trace.setConf(conf);
Assert.assertEquals("ret:0, [no span receivers found]\n", Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE,
runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster))); runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster)));
Assert.assertEquals("ret:0, Added trace span receiver 1 with " + Assert.assertEquals("ret:0, Added trace span receiver 1 with " +
"configuration local-file-span-receiver.path = " + tracePath + "\n", "configuration local-file-span-receiver.path = " + tracePath + NEWLINE,
runTraceCommand(trace, "-add", "-host", getHostPortForNN(cluster), runTraceCommand(trace, "-add", "-host", getHostPortForNN(cluster),
"-class", "org.htrace.impl.LocalFileSpanReceiver", "-class", "org.htrace.impl.LocalFileSpanReceiver",
"-Clocal-file-span-receiver.path=" + tracePath)); "-Clocal-file-span-receiver.path=" + tracePath));
@ -77,10 +78,10 @@ public class TestTraceAdmin {
runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster)); runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster));
Assert.assertTrue(list.startsWith("ret:0")); Assert.assertTrue(list.startsWith("ret:0"));
Assert.assertTrue(list.contains("1 org.htrace.impl.LocalFileSpanReceiver")); Assert.assertTrue(list.contains("1 org.htrace.impl.LocalFileSpanReceiver"));
Assert.assertEquals("ret:0, Removed trace span receiver 1\n", Assert.assertEquals("ret:0, Removed trace span receiver 1" + NEWLINE,
runTraceCommand(trace, "-remove", "1", "-host", runTraceCommand(trace, "-remove", "1", "-host",
getHostPortForNN(cluster))); getHostPortForNN(cluster)));
Assert.assertEquals("ret:0, [no span receivers found]\n", Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE,
runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster))); runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster)));
} finally { } finally {
cluster.shutdown(); cluster.shutdown();