Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 83FEE17978 for ; Fri, 7 Nov 2014 22:33:20 +0000 (UTC) Received: (qmail 86365 invoked by uid 500); 7 Nov 2014 22:33:20 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 86294 invoked by uid 500); 7 Nov 2014 22:33:20 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 86285 invoked by uid 99); 7 Nov 2014 22:33:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Nov 2014 22:33:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E7DA099DF8F; Fri, 7 Nov 2014 22:33:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cnauroth@apache.org To: common-commits@hadoop.apache.org Message-Id: <26c7c87ca18d42f09be119c9c09c9504@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-11282. Skip NFS TestShellBasedIdMapping tests that are irrelevant on Windows. Contributed by Chris Nauroth. Date: Fri, 7 Nov 2014 22:33:19 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 a50345f65 -> 3ef876712 HADOOP-11282. Skip NFS TestShellBasedIdMapping tests that are irrelevant on Windows. Contributed by Chris Nauroth. (cherry picked from commit 68db5b3736287ef218acc861368c6b95b72fa2f4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3ef87671 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3ef87671 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3ef87671 Branch: refs/heads/branch-2 Commit: 3ef876712c389391784068fe05f724d84957bbec Parents: a50345f Author: cnauroth Authored: Fri Nov 7 14:30:29 2014 -0800 Committer: cnauroth Committed: Fri Nov 7 14:32:04 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/security/TestShellBasedIdMapping.java | 5 +++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ef87671/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index a5ae0d0..3e8720a 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -560,6 +560,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ef87671/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java ---------------------------------------------------------------------- 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 a3857e3..808c3fd 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 @@ package org.apache.hadoop.security; 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.io.OutputStream; 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 class TestShellBasedIdMapping { @Test public void testStaticMapping() throws IOException { + assumeTrue(!Shell.WINDOWS); Map uidStaticMap = new PassThroughMap(); Map gidStaticMap = new PassThroughMap(); @@ -113,6 +116,7 @@ public class TestShellBasedIdMapping { @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 class TestShellBasedIdMapping { @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"