Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0921717C0B for ; Tue, 7 Apr 2015 23:20:21 +0000 (UTC) Received: (qmail 44880 invoked by uid 500); 7 Apr 2015 23:20:21 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 44841 invoked by uid 500); 7 Apr 2015 23:20:20 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 44832 invoked by uid 99); 7 Apr 2015 23:20:20 -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; Tue, 07 Apr 2015 23:20:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0600E1865; Tue, 7 Apr 2015 23:20:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hitesh@apache.org To: commits@tez.apache.org Message-Id: <1c07c7f6d8bc4accaf63b67dfc99d945@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tez git commit: TEZ-2223. TestMockDAGAppMaster fails due to TEZ-2210 on mac. (hitesh) Date: Tue, 7 Apr 2015 23:20:20 +0000 (UTC) Repository: tez Updated Branches: refs/heads/master 617643237 -> 74b400b1c TEZ-2223. TestMockDAGAppMaster fails due to TEZ-2210 on mac. (hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/74b400b1 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/74b400b1 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/74b400b1 Branch: refs/heads/master Commit: 74b400b1c2307924733e101347de8d1c7831ce64 Parents: 6176432 Author: Hitesh Shah Authored: Tue Apr 7 16:19:45 2015 -0700 Committer: Hitesh Shah Committed: Tue Apr 7 16:19:45 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../java/org/apache/tez/dag/app/TestMockDAGAppMaster.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/74b400b1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index dc28971..a5c46cc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES TEZ-1993. Implement a pluggable InputSizeEstimator for grouping fairly ALL CHANGES: + TEZ-2223. TestMockDAGAppMaster fails due to TEZ-2210 on mac. TEZ-2236. Tez UI: Support loading of all tasks in the dag tasks page TEZ-2159. Tez UI: download timeline data for offline use. TEZ-2269. DAGAppMaster becomes unresponsive (post TEZ-2149). http://git-wip-us.apache.org/repos/asf/tez/blob/74b400b1/tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java b/tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java index 1150b10..1b8acab 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java @@ -24,6 +24,7 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; @@ -297,7 +298,12 @@ public class TestMockDAGAppMaster { DAGStatus status = dagClient.waitForCompletion(); Assert.assertEquals(DAGStatus.State.SUCCEEDED, status.getState()); TezCounters counters = dagImpl.getAllCounters(); - Assert.assertTrue(counters.findCounter(DAGCounter.AM_CPU_MILLISECONDS).getValue() > 0); + + String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH); + if (!osName.contains("mac")) { + Assert.assertTrue(counters.findCounter(DAGCounter.AM_CPU_MILLISECONDS).getValue() > 0); + } + // verify processor counters Assert.assertEquals(10, counters.findCounter(vAName, procCounterName).getValue()); Assert.assertEquals(1, counters.findCounter(vBName, procCounterName).getValue());