tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject tez git commit: TEZ-2223. TestMockDAGAppMaster fails due to TEZ-2210 on mac. (hitesh)
Date Tue, 07 Apr 2015 23:20:20 GMT
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 <hitesh@apache.org>
Authored: Tue Apr 7 16:19:45 2015 -0700
Committer: Hitesh Shah <hitesh@apache.org>
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());


Mime
View raw message