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 ha...@apache.org on 2015/03/22 06:04:04 UTC
hadoop git commit: MAPREDUCE-5448. Addendum fix to remove deprecation
warning by junit.Assert import in TestFileOutputCommitter.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 40682a4aa -> 6e6e0e4a3
MAPREDUCE-5448. Addendum fix to remove deprecation warning by junit.Assert import in TestFileOutputCommitter.
(cherry picked from commit 4cd54d9a297435150ab61803284eb05603f114e2)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e6e0e4a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e6e0e4a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e6e0e4a
Branch: refs/heads/branch-2
Commit: 6e6e0e4a3763680370404501d3fe319ee1631b71
Parents: 40682a4
Author: Harsh J <ha...@cloudera.com>
Authored: Sun Mar 22 10:33:15 2015 +0530
Committer: Harsh J <ha...@cloudera.com>
Committed: Sun Mar 22 10:33:29 2015 +0530
----------------------------------------------------------------------
.../hadoop/mapreduce/lib/output/TestFileOutputCommitter.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e6e0e4a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
index 5c4428b..7678f35 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
@@ -315,7 +314,7 @@ public class TestFileOutputCommitter extends TestCase {
try {
MapFileOutputFormat.getReaders(outDir, conf);
} catch (Exception e) {
- Assert.fail("Fail to read from MapFileOutputFormat: " + e);
+ fail("Fail to read from MapFileOutputFormat: " + e);
e.printStackTrace();
}