From abb2ebbc3a58506d01e8450aaf713a47ed4a4446 Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Thu, 18 Dec 2014 10:59:42 -0800 Subject: [PATCH] HADOOP-11125. Remove redundant tests in TestOsSecureRandom. Contributed by Masanori Oyama. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop/crypto/random/TestOsSecureRandom.java | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 14c332600a4..2378b5bd14a 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -608,6 +608,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 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 50a0031c9fa..6c2e5b88bcc 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 void testRefillReservoir() throws Exception { } 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()); - } - } }