You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by zj...@apache.org on 2015/04/24 03:33:54 UTC
tez git commit: TEZ-2341. TestMockDAGAppMaster.testBasicCounters
fails on windows (zjffdu)
Repository: tez
Updated Branches:
refs/heads/master ec7b481b6 -> 0a64ae746
TEZ-2341. TestMockDAGAppMaster.testBasicCounters fails on windows (zjffdu)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/0a64ae74
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/0a64ae74
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/0a64ae74
Branch: refs/heads/master
Commit: 0a64ae746464b4070d41042510c27c5de48ad44b
Parents: ec7b481
Author: Jeff Zhang <zj...@apache.org>
Authored: Fri Apr 24 09:33:43 2015 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Fri Apr 24 09:33:43 2015 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/0a64ae74/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 43767d2..47af758 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-2341. TestMockDAGAppMaster.testBasicCounters fails on windows
TEZ-2352. Move getTaskStatistics into the RuntimeTask class.
TEZ-2357. Tez UI: misc.js.orig is committed by accident
TEZ-2261. Should add diagnostics in DAGAppMaster when recovery error happens
http://git-wip-us.apache.org/repos/asf/tez/blob/0a64ae74/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 33dd18d..2a061bc 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
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.SystemUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -319,7 +320,7 @@ public class TestMockDAGAppMaster {
TezCounters counters = dagImpl.getAllCounters();
String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
- if (!osName.contains("mac")) {
+ if (SystemUtils.IS_OS_LINUX) {
Assert.assertTrue(counters.findCounter(DAGCounter.AM_CPU_MILLISECONDS).getValue() > 0);
}