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

HADOOP-9429. Merging change 1464725 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464728 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-04-04 20:29:32 +00:00
parent 43ad7efb4c
commit 5dda325714
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -107,6 +107,9 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9357. Fallback to default authority if not specified in FileContext. HADOOP-9357. Fallback to default authority if not specified in FileContext.
(Andrew Wang via eli) (Andrew Wang via eli)
HADOOP-9429. TestConfiguration fails with IBM JAVA. (Amir Sanjar via
suresh)
Release 2.0.4-alpha - UNRELEASED Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
View File

@ -51,6 +51,10 @@ public class TestConfiguration extends TestCase {
final static String CONFIG = new File("./test-config.xml").getAbsolutePath(); final static String CONFIG = new File("./test-config.xml").getAbsolutePath();
final static String CONFIG2 = new File("./test-config2.xml").getAbsolutePath(); final static String CONFIG2 = new File("./test-config2.xml").getAbsolutePath();
final static Random RAN = new Random(); final static Random RAN = new Random();
final static boolean IBMJAVA = System.getProperty("java.vendor").contains("IBM");
final static String XMLHEADER =
IBMJAVA?"<?xml version=\"1.0\" encoding=\"UTF-8\"?><configuration>":
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><configuration>";
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
@ -327,8 +331,8 @@ public class TestConfiguration extends TestCase {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
conf.writeXml(baos); conf.writeXml(baos);
String result = baos.toString(); String result = baos.toString();
assertTrue("Result has proper header", result.startsWith( assertTrue("Result has proper header", result.startsWith(XMLHEADER));
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><configuration>"));
assertTrue("Result has proper footer", result.endsWith("</configuration>")); assertTrue("Result has proper footer", result.endsWith("</configuration>"));
} }