YARN-5657. Fix TestDefaultContainerExecutor. (asuresh)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f67237cb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f67237cb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f67237cb Branch: refs/heads/HADOOP-12756 Commit: f67237cbe7bc48a1b9088e990800b37529f1db2a Parents: 4174b97 Author: Arun Suresh <asur...@apache.org> Authored: Sat Sep 17 09:29:03 2016 -0700 Committer: Arun Suresh <asur...@apache.org> Committed: Sat Sep 17 09:32:05 2016 -0700 ---------------------------------------------------------------------- .../server/nodemanager/TestDefaultContainerExecutor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f67237cb/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java index e2ec693..3bb8008 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java @@ -22,6 +22,7 @@ import static org.apache.hadoop.fs.CreateFlag.CREATE; import static org.apache.hadoop.fs.CreateFlag.OVERWRITE; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -386,8 +387,8 @@ public class TestDefaultContainerExecutor { } } return null; - } - }).when(mockUtil).copy(any(Path.class), any(Path.class)); + }}).when(mockUtil).copy(any(Path.class), any(Path.class), + anyBoolean(), anyBoolean()); doAnswer(new Answer() { @Override @@ -478,7 +479,8 @@ public class TestDefaultContainerExecutor { } // Verify that the calls happen the expected number of times - verify(mockUtil, times(1)).copy(any(Path.class), any(Path.class)); + verify(mockUtil, times(1)).copy(any(Path.class), any(Path.class), + anyBoolean(), anyBoolean()); verify(mockLfs, times(2)).getFsStatus(any(Path.class)); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
