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 wh...@apache.org on 2014/12/18 19:59:51 UTC

hadoop git commit: HADOOP-11125. Remove redundant tests in TestOsSecureRandom. Contributed by Masanori Oyama.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 cec930020 -> 8854c7801


HADOOP-11125. Remove redundant tests in TestOsSecureRandom. Contributed by Masanori Oyama.


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

Branch: refs/heads/branch-2
Commit: 8854c780150d9a3c23df534e1235b360254863c5
Parents: cec9300
Author: Haohui Mai <wh...@apache.org>
Authored: Thu Dec 18 10:59:42 2014 -0800
Committer: Haohui Mai <wh...@apache.org>
Committed: Thu Dec 18 10:59:48 2014 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt       |  3 +++
 .../hadoop/crypto/random/TestOsSecureRandom.java      | 14 --------------
 2 files changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/8854c780/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 f3392b0..5b980d2 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -260,6 +260,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11358. Tests for encryption/decryption with IV calculation
     overflow. (yliu)
 
+    HADOOP-11125. Remove redundant tests in TestOsSecureRandom.
+    (Masanori Oyama via wheat9)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8854c780/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/random/TestOsSecureRandom.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/random/TestOsSecureRandom.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/random/TestOsSecureRandom.java
index 50a0031..6c2e5b8 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/random/TestOsSecureRandom.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/random/TestOsSecureRandom.java
@@ -137,18 +137,4 @@ public class TestOsSecureRandom {
     }
     random.close();
   }
-  
-  @Test(timeout=120000)
-  public void testOsSecureRandomSetConf() throws IOException {
-    Assume.assumeTrue(SystemUtils.IS_OS_LINUX);
-    OsSecureRandom random = new OsSecureRandom();
-    for(int n = 0; n < 10; ++n) {
-      random.setConf(new Configuration());
-      String[] scmd = new String[] {"/bin/sh", "-c", "lsof | wc -l"};
-      ShellCommandExecutor sce = new ShellCommandExecutor(scmd);
-      sce.execute(); 
-      System.out.println("==lsof result " + n + ":");
-      System.out.println(sce.getOutput());
-    }
-  }
 }