From 68db5b3736287ef218acc861368c6b95b72fa2f4 Mon Sep 17 00:00:00 2001 From: cnauroth Date: Fri, 7 Nov 2014 14:30:29 -0800 Subject: [PATCH] HADOOP-11282. Skip NFS TestShellBasedIdMapping tests that are irrelevant on Windows. Contributed by Chris Nauroth. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/security/TestShellBasedIdMapping.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0192560a1d..550b009dbd 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1086,6 +1086,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11280. TestWinUtils#testChmod fails after removal of NO_PROPAGATE_INHERIT_ACE. (cnauroth) + HADOOP-11282. Skip NFS TestShellBasedIdMapping tests that are irrelevant on + Windows. (cnauroth) + Release 2.5.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java index a3857e3dd2..808c3fd2a6 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java @@ -19,6 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; import java.io.File; import java.io.FileOutputStream; @@ -27,6 +28,7 @@ import java.util.Map; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.util.Shell; import org.apache.hadoop.security.ShellBasedIdMapping.PassThroughMap; import org.apache.hadoop.security.ShellBasedIdMapping.StaticMapping; import org.junit.Test; @@ -73,6 +75,7 @@ public void testStaticMapParsing() throws IOException { @Test public void testStaticMapping() throws IOException { + assumeTrue(!Shell.WINDOWS); Map uidStaticMap = new PassThroughMap(); Map gidStaticMap = new PassThroughMap(); @@ -113,6 +116,7 @@ public void testStaticMapping() throws IOException { @Test public void testDuplicates() throws IOException { + assumeTrue(!Shell.WINDOWS); String GET_ALL_USERS_CMD = "echo \"root:x:0:0:root:/root:/bin/bash\n" + "hdfs:x:11501:10787:Grid Distributed File System:/home/hdfs:/bin/bash\n" + "hdfs:x:11502:10788:Grid Distributed File System:/home/hdfs:/bin/bash\n" @@ -152,6 +156,7 @@ public void testDuplicates() throws IOException { @Test public void testIdOutOfIntegerRange() throws IOException { + assumeTrue(!Shell.WINDOWS); String GET_ALL_USERS_CMD = "echo \"" + "nfsnobody:x:4294967294:4294967294:Anonymous NFS User:/var/lib/nfs:/sbin/nologin\n" + "nfsnobody1:x:4294967295:4294967295:Anonymous NFS User:/var/lib/nfs1:/sbin/nologin\n"