tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject git commit: TEZ-726. TestVertexImpl and TestDAGImpl failing after TEZ-582 (bikas)
Date Mon, 13 Jan 2014 21:45:05 GMT
Updated Branches:
  refs/heads/master 3c5b18579 -> a1164c4db


TEZ-726. TestVertexImpl and TestDAGImpl failing after TEZ-582 (bikas)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/a1164c4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/a1164c4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/a1164c4d

Branch: refs/heads/master
Commit: a1164c4dbcdb39838e1e0906476b8e3e3c653bec
Parents: 3c5b185
Author: Bikas Saha <bikas@apache.org>
Authored: Mon Jan 13 13:44:48 2014 -0800
Committer: Bikas Saha <bikas@apache.org>
Committed: Mon Jan 13 13:44:48 2014 -0800

----------------------------------------------------------------------
 .../src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java  | 1 +
 .../test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java   | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/a1164c4d/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
index 426e5f6..205cb7b 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
@@ -497,6 +497,7 @@ public class TestDAGImpl {
     dispatcher = new DrainDispatcher();
     fsTokens = new Credentials();
     appContext = mock(AppContext.class);
+    doReturn(conf).when(appContext).getAMConf();
     doReturn(appAttemptId).when(appContext).getApplicationAttemptId();
     doReturn(dagId).when(appContext).getCurrentDAGID();
     dag = new DAGImpl(dagId, conf, dagPlan,

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/a1164c4d/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
index 2705741..e2403ca 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
@@ -1087,6 +1087,7 @@ public class TestVertexImpl {
     doReturn(ugi).when(dag).getDagUGI();
     doReturn(appAttemptId).when(appContext).getApplicationAttemptId();
     doReturn(dag).when(appContext).getCurrentDAG();
+    doReturn(conf).when(appContext).getAMConf();
     doReturn(new Credentials()).when(dag).getCredentials();
     doReturn(DAGPlan.getDefaultInstance()).when(dag).getJobPlan();
     doReturn(dagId).when(appContext).getCurrentDAGID();


Mime
View raw message