Repository: hadoop Updated Branches: refs/heads/branch-2.8 4ab508ead -> 1fc36b824
HADOOP-12590. TestCompressorDecompressor failing without stack traces (John Zhuge via stevel) (cherry picked from commit 80734bc346e8d339a2427b4f691365298acf062c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1fc36b82 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1fc36b82 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1fc36b82 Branch: refs/heads/branch-2.8 Commit: 1fc36b824cef92a76f7d08c6cc8dc3acad56b39e Parents: 4ab508e Author: Steve Loughran <[email protected]> Authored: Sat Jan 9 11:10:20 2016 +0000 Committer: Akira Ajisaka <[email protected]> Committed: Fri Jan 15 10:41:56 2016 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../apache/hadoop/io/compress/TestCompressorDecompressor.java | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1fc36b82/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 cd6576c..b8201cf 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -970,6 +970,9 @@ Release 2.7.3 - UNRELEASED HADOOP-12706. TestLocalFsFCStatistics#testStatisticsThreadLocalDataCleanUp times out occasionally (Sangjin Lee and Colin Patrick McCabe via jlowe) + HADOOP-12590. TestCompressorDecompressor failing without stack traces + (John Zhuge via stevel) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1fc36b82/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java index a8ac993..49a41fb 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java @@ -26,6 +26,7 @@ import org.apache.hadoop.io.compress.snappy.SnappyCompressor; import org.apache.hadoop.io.compress.snappy.SnappyDecompressor; import org.apache.hadoop.io.compress.zlib.BuiltInZlibDeflater; import org.apache.hadoop.io.compress.zlib.BuiltInZlibInflater; +import org.apache.hadoop.test.GenericTestUtils; import org.junit.Test; import com.google.common.collect.ImmutableSet; @@ -66,7 +67,8 @@ public class TestCompressorDecompressor { .test(); } catch (Exception ex) { - fail("testCompressorDecompressor error !!!" + ex); + GenericTestUtils.assertExceptionContains( + "testCompressorDecompressor error !!!", ex); } } @@ -88,7 +90,8 @@ public class TestCompressorDecompressor { .test(); } catch (Exception ex) { - fail("testCompressorDecompressorWithExeedBufferLimit error !!!" + ex); + GenericTestUtils.assertExceptionContains( + "testCompressorDecompressorWithExeedBufferLimit error !!!", ex); } }
