Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C97CE17A57 for ; Sun, 22 Mar 2015 05:04:04 +0000 (UTC) Received: (qmail 35905 invoked by uid 500); 22 Mar 2015 05:04:04 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 35839 invoked by uid 500); 22 Mar 2015 05:04:04 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 35830 invoked by uid 99); 22 Mar 2015 05:04:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Mar 2015 05:04:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 43A93E0D5F; Sun, 22 Mar 2015 05:04:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: harsh@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: MAPREDUCE-5448. Addendum fix to remove deprecation warning by junit.Assert import in TestFileOutputCommitter. Date: Sun, 22 Mar 2015 05:04:04 +0000 (UTC) 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 Authored: Sun Mar 22 10:33:15 2015 +0530 Committer: Harsh J 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(); }