HADOOP-11673. Skip using JUnit Assume in TestCodec. Contributed by Brahma Reddy Battula.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/662781eb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/662781eb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/662781eb Branch: refs/heads/HDFS-7285 Commit: 662781eb49a925dfaa842f5b00ff9404a8ad2052 Parents: a1e4dfe Author: Chris Douglas <cdoug...@apache.org> Authored: Sun Mar 8 19:15:46 2015 -0700 Committer: Jing Zhao <ji...@apache.org> Committed: Mon Mar 9 13:17:55 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/io/compress/TestCodec.java | 16 ++++------------ 2 files changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/662781eb/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 16002d5..0af0beb 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -184,6 +184,9 @@ Trunk (Unreleased) HADOOP-11593. Convert site documentation from apt to markdown (stragglers) (Masatake Iwasaki via aw) + HADOOP-11673. Skip using JUnit Assume in TestCodec. (Brahma Reddy Battula + via cdouglas) + BUG FIXES HADOOP-11473. test-patch says "-1 overall" even when all checks are +1 http://git-wip-us.apache.org/repos/asf/hadoop/blob/662781eb/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java index 98b3934..7246bf5 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java @@ -74,6 +74,7 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.Test; import static org.junit.Assert.*; +import static org.junit.Assume.*; public class TestCodec { @@ -364,10 +365,7 @@ public class TestCodec { public void testCodecPoolGzipReuse() throws Exception { Configuration conf = new Configuration(); conf.setBoolean(CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY, true); - if (!ZlibFactory.isNativeZlibLoaded(conf)) { - LOG.warn("testCodecPoolGzipReuse skipped: native libs not loaded"); - return; - } + assumeTrue(ZlibFactory.isNativeZlibLoaded(conf)); GzipCodec gzc = ReflectionUtils.newInstance(GzipCodec.class, conf); DefaultCodec dfc = ReflectionUtils.newInstance(DefaultCodec.class, conf); Compressor c1 = CodecPool.getCompressor(gzc); @@ -723,10 +721,7 @@ public class TestCodec { public void testNativeGzipConcat() throws IOException { Configuration conf = new Configuration(); conf.setBoolean(CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY, true); - if (!ZlibFactory.isNativeZlibLoaded(conf)) { - LOG.warn("skipped: native libs not loaded"); - return; - } + assumeTrue(ZlibFactory.isNativeZlibLoaded(conf)); GzipConcatTest(conf, GzipCodec.GzipZlibDecompressor.class); } @@ -840,10 +835,7 @@ public class TestCodec { Configuration conf = new Configuration(); conf.setBoolean(CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY, useNative); if (useNative) { - if (!ZlibFactory.isNativeZlibLoaded(conf)) { - LOG.warn("testGzipCodecWrite skipped: native libs not loaded"); - return; - } + assumeTrue(ZlibFactory.isNativeZlibLoaded(conf)); } else { assertFalse("ZlibFactory is using native libs against request", ZlibFactory.isNativeZlibLoaded(conf));
