HADOOP-9131. Merge r1420366 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490118 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
c2f9f05323
commit
6067bd1228
|
@ -242,6 +242,10 @@ Release 2.1.0-beta - UNRELEASED
|
||||||
HADOOP-8957 AbstractFileSystem#IsValidName should be overridden for
|
HADOOP-8957 AbstractFileSystem#IsValidName should be overridden for
|
||||||
embedded file systems like ViewFs (Chris Nauroth via Sanjay Radia)
|
embedded file systems like ViewFs (Chris Nauroth via Sanjay Radia)
|
||||||
|
|
||||||
|
HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
|
||||||
|
|
||||||
|
HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
|
||||||
|
|
||||||
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
|
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
|
||||||
|
|
||||||
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
|
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
|
||||||
|
@ -416,9 +420,8 @@ Release 2.1.0-beta - UNRELEASED
|
||||||
|
|
||||||
HADOOP-9397. Incremental dist tar build fails. (Chris Nauroth via jlowe)
|
HADOOP-9397. Incremental dist tar build fails. (Chris Nauroth via jlowe)
|
||||||
|
|
||||||
HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
|
HADOOP-9131. Turn off TestLocalFileSystem#testListStatusWithColons on
|
||||||
|
Windows. (Chris Nauroth via suresh)
|
||||||
HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
|
|
||||||
|
|
||||||
Release 2.0.5-alpha - UNRELEASED
|
Release 2.0.5-alpha - UNRELEASED
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ package org.apache.hadoop.fs;
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
import org.apache.hadoop.fs.FileSystem.Statistics;
|
import org.apache.hadoop.fs.FileSystem.Statistics;
|
||||||
import org.apache.hadoop.util.StringUtils;
|
import org.apache.hadoop.util.StringUtils;
|
||||||
|
import org.apache.hadoop.util.Shell;
|
||||||
|
|
||||||
import static org.apache.hadoop.fs.FileSystemTestHelper.*;
|
import static org.apache.hadoop.fs.FileSystemTestHelper.*;
|
||||||
|
|
||||||
|
@ -28,6 +29,7 @@ import java.util.Arrays;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
import static org.junit.Assume.assumeTrue;
|
||||||
|
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
@ -263,6 +265,7 @@ public class TestLocalFileSystem {
|
||||||
|
|
||||||
@Test(timeout = 1000)
|
@Test(timeout = 1000)
|
||||||
public void testListStatusWithColons() throws IOException {
|
public void testListStatusWithColons() throws IOException {
|
||||||
|
assumeTrue(!Shell.WINDOWS);
|
||||||
File colonFile = new File(TEST_ROOT_DIR, "foo:bar");
|
File colonFile = new File(TEST_ROOT_DIR, "foo:bar");
|
||||||
colonFile.mkdirs();
|
colonFile.mkdirs();
|
||||||
FileStatus[] stats = fileSys.listStatus(new Path(TEST_ROOT_DIR));
|
FileStatus[] stats = fileSys.listStatus(new Path(TEST_ROOT_DIR));
|
||||||
|
|
Loading…
Reference in New Issue