Repository: flink Updated Branches: refs/heads/master 1809cad6d -> a7e0a277f
[FLINK-7773] [tests] Fix unfinished stubbing in UtilsTest The problem seemed to be that the TestingContainer dynamically stubbed the ContainerId and the NodeId. I assume that this could happen concurrently to mocking the nodeManagerClient which would cause the unfinished stubbing exception. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a7e0a277 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a7e0a277 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a7e0a277 Branch: refs/heads/master Commit: a7e0a277fe2a06e516ee02d435e8b17385023455 Parents: 358aacd Author: Till Rohrmann <[email protected]> Authored: Wed Nov 1 15:24:17 2017 +0100 Committer: Till Rohrmann <[email protected]> Committed: Wed Nov 1 15:48:00 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/flink/yarn/UtilsTest.java | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/a7e0a277/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTest.java ---------------------------------------------------------------------- diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTest.java b/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTest.java index a5ec176..69c6e7d 100644 --- a/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTest.java +++ b/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTest.java @@ -37,6 +37,8 @@ import akka.actor.ActorSystem; import akka.actor.PoisonPill; import akka.actor.Props; import akka.testkit.JavaTestKit; +import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; +import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; @@ -71,7 +73,6 @@ import scala.concurrent.duration.FiniteDuration; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Tests for {@link Utils}. @@ -117,7 +118,7 @@ public class UtilsTest extends TestLogger { final List<Container> containerList = new ArrayList<>(); for (int i = 0; i < numInitialTaskManagers; i++) { - containerList.add(new TestingContainer("container_" + i, "localhost")); + containerList.add(new TestingContainer("container", 1234, i)); } doAnswer(new Answer() { @@ -223,19 +224,22 @@ public class UtilsTest extends TestLogger { static class TestingContainer extends Container { - private final String id; - private final String host; - - TestingContainer(String id, String host) { - this.id = id; - this.host = host; + private final NodeId nodeId; + private final ContainerId containerId; + + TestingContainer(String host, int port, int containerId) { + this.nodeId = NodeId.newInstance(host, port); + this.containerId = ContainerId.newInstance( + ApplicationAttemptId.newInstance( + ApplicationId.newInstance( + System.currentTimeMillis(), + 1), + 1), + containerId); } @Override public ContainerId getId() { - ContainerId containerId = mock(ContainerId.class); - when(containerId.toString()).thenReturn(id); - return containerId; } @@ -246,9 +250,6 @@ public class UtilsTest extends TestLogger { @Override public NodeId getNodeId() { - NodeId nodeId = mock(NodeId.class); - when(nodeId.getHost()).thenReturn(host); - return nodeId; }
