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 cn...@apache.org on 2015/04/08 00:33:20 UTC

[3/3] hadoop git commit: HADOOP-11796. Skip TestShellBasedIdMapping.testStaticMapUpdate on Windows. Contributed by Xiaoyu Yao.

HADOOP-11796. Skip TestShellBasedIdMapping.testStaticMapUpdate on Windows. Contributed by Xiaoyu Yao.

(cherry picked from commit bd77a7c4d94fe8a74b36deb50e19396c98b8908e)
(cherry picked from commit 6e70611819e81eb0690dda00b9789ed250f3959c)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c6ad39e4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c6ad39e4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c6ad39e4

Branch: refs/heads/branch-2.7
Commit: c6ad39e406cdf351af6048a494162082492d1880
Parents: 5021f52
Author: cnauroth <cn...@apache.org>
Authored: Tue Apr 7 14:47:21 2015 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Tue Apr 7 14:47:52 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                   | 3 +++
 .../java/org/apache/hadoop/security/TestShellBasedIdMapping.java  | 1 +
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6ad39e4/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 f008348..0f75ed2 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -723,6 +723,9 @@ Release 2.7.0 - UNRELEASED
     Ozawa via vinodkv)
 
     HADOOP-11776. Fixed the broken JDiff support in Hadoop 2. (Li Lu via vinodkv)
+
+    HADOOP-11796. Skip TestShellBasedIdMapping.testStaticMapUpdate on Windows.
+    (Xiaoyu Yao via cnauroth)
     
 Release 2.6.1 - UNRELEASED
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6ad39e4/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 e6e1d73..3b533d2 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
@@ -129,6 +129,7 @@ public class TestShellBasedIdMapping {
   // Test staticMap refreshing
   @Test
   public void testStaticMapUpdate() throws IOException {
+    assumeTrue(!Shell.WINDOWS);
     File tempStaticMapFile = File.createTempFile("nfs-", ".map");
     tempStaticMapFile.delete();
     Configuration conf = new Configuration();