Repository: tez Updated Branches: refs/heads/master 87f62a35b -> fcae27514
TEZ-3735. Test failures in TestTaskAttempt and TestAMContainerMap (Kuhu Shukla via jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/fcae2751 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/fcae2751 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/fcae2751 Branch: refs/heads/master Commit: fcae2751452c9ce0879f07761a7561c83e3c6af8 Parents: 87f62a3 Author: Jonathan Eagles <[email protected]> Authored: Wed May 24 16:20:18 2017 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Wed May 24 16:20:18 2017 -0500 ---------------------------------------------------------------------- .../test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java | 1 + .../org/apache/tez/dag/app/rm/container/TestAMContainerMap.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/fcae2751/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java index d5464c8..a9d0c8d 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java @@ -153,6 +153,7 @@ public class TestTaskAttempt { @Before public void setupTest() { appCtx = mock(AppContext.class); + when(appCtx.getAMConf()).thenReturn(new Configuration()); when(appCtx.getContainerLauncherName(anyInt())).thenReturn( TezConstants.getTezYarnServicePluginName()); http://git-wip-us.apache.org/repos/asf/tez/blob/fcae2751/tez-dag/src/test/java/org/apache/tez/dag/app/rm/container/TestAMContainerMap.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/container/TestAMContainerMap.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/container/TestAMContainerMap.java index d16881c..17a9c53 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/container/TestAMContainerMap.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/container/TestAMContainerMap.java @@ -45,6 +45,7 @@ import org.apache.tez.dag.app.ContainerHeartbeatHandler; import org.apache.tez.dag.app.TaskCommunicatorManagerInterface; import org.apache.tez.serviceplugins.api.ServicePluginException; import org.junit.Test; +import static org.mockito.Mockito.when; public class TestAMContainerMap { @@ -55,6 +56,7 @@ public class TestAMContainerMap { ContainerHeartbeatHandler chh = mock(ContainerHeartbeatHandler.class); TaskCommunicatorManagerInterface tal = mock(TaskCommunicatorManagerInterface.class); AppContext appContext = mock(AppContext.class); + when(appContext.getAMConf()).thenReturn(new Configuration());
