HADOOP-11673. Skip using JUnit Assume in TestCodec.
Contributed by Brahma Reddy Battula.
This commit is contained in:
parent
6ee0d32b98
commit
790aa6790e
@ -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
|
||||
|
@ -74,6 +74,7 @@
|
||||
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 @@ private static Path writeSplitTestFile(FileSystem fs, Random rand,
|
||||
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 void testBuiltInGzipConcat() throws IOException {
|
||||
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 void testGzipCodecWrite(boolean useNative) throws IOException {
|
||||
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));
|
||||
|
Loading…
Reference in New Issue
Block a user