From ea3af2618836bb15e460c3daf7b37049975226d6 Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Tue, 11 Dec 2012 19:52:22 +0000 Subject: [PATCH] HADOOP-9131. Turn off TestLocalFileSystem#testListStatusWithColons on Windows. Contributed by Chris Nauroth. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1420366 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../test/java/org/apache/hadoop/fs/TestLocalFileSystem.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c1df0b1efb..08c289aa08 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -295,6 +295,9 @@ Trunk (Unreleased) HADOOP-9121. InodeTree.java has redundant check for vName while throwing exception. (Arup Malakar via suresh) + HADOOP-9131. Turn off TestLocalFileSystem#testListStatusWithColons on + Windows. (Chris Nauroth via suresh) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java index eb3d33df37..cf1d2df340 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java @@ -19,12 +19,14 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem.Statistics; +import org.apache.hadoop.util.Shell; import static org.apache.hadoop.fs.FileSystemTestHelper.*; import java.io.*; import static org.junit.Assert.*; +import static org.junit.Assume.assumeTrue; import org.junit.Before; import org.junit.Test; @@ -262,6 +264,7 @@ public void testHasFileDescriptor() throws IOException { @Test public void testListStatusWithColons() throws IOException { + assumeTrue(!Shell.WINDOWS); Configuration conf = new Configuration(); LocalFileSystem fs = FileSystem.getLocal(conf); File colonFile = new File(TEST_ROOT_DIR, "foo:bar");