You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2012/11/08 20:13:47 UTC
svn commit: r1407223 - in
/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/docs/ src/main/java/ src/test/core/
src/test/java/org/apache/hadoop/fs/TestDFVariations.java
Author: suresh
Date: Thu Nov 8 19:13:45 2012
New Revision: 1407223
URL: http://svn.apache.org/viewvc?rev=1407223&view=rev
Log:
Merging changes from trunk to branch-trunk-win
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1407223&r1=1407222&r2=1407223&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt Thu Nov 8 19:13:45 2012
@@ -272,7 +272,10 @@ Trunk (Unreleased)
HADOOP-8918. test-patch.sh is parsing modified files wrong.
(Raja Aluri via suresh)
- HADOOP-8589 ViewFs tests fail when tests and home dirs are nested (sanjay Radia)
+ HADOOP-8589 ViewFs tests fail when tests and home dirs are nested.
+ (sanjay Radia)
+
+ HADOOP-8974. TestDFVariations fails on Windows. (Chris Nauroth via suresh)
OPTIMIZATIONS
Propchange: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1407202-1407222
Propchange: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1407202-1407222
Propchange: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1407202-1407222
Propchange: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1407202-1407222
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java?rev=1407223&r1=1407222&r2=1407223&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java Thu Nov 8 19:13:45 2012
@@ -23,6 +23,8 @@ import java.io.File;
import java.io.IOException;
import java.util.EnumSet;
+import org.apache.hadoop.util.Shell;
+
public class TestDFVariations extends TestCase {
public static class XXDF extends DF {
@@ -51,7 +53,9 @@ public class TestDFVariations extends Te
public void testOSParsing() throws Exception {
for (DF.OSType ost : EnumSet.allOf(DF.OSType.class)) {
XXDF df = new XXDF(ost.getId());
- assertEquals(ost.getId() + " mount", "/foo/bar", df.getMount());
+ assertEquals(ost.getId() + " mount",
+ Shell.WINDOWS ? df.getDirPath().substring(0, 2) : "/foo/bar",
+ df.getMount());
}
}