Repository: hadoop Updated Branches: refs/heads/branch-2.8 72a8c8dc6 -> 990e272f9
HDFS-11258. Addendum patch to fix compile issue. Contributed by Jimmy Xiang. (cherry picked from commit 16c4dcad854059f63fd3052b3c006ac6130fab8c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/990e272f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/990e272f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/990e272f Branch: refs/heads/branch-2.8 Commit: 990e272f960a18bb9ddbc10e0ef9e6ff041b9957 Parents: 72a8c8d Author: Akira Ajisaka <[email protected]> Authored: Fri Dec 23 03:56:12 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Fri Dec 23 03:58:10 2016 +0900 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/990e272f/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java index c75e8ec..3273d64 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java @@ -27,8 +27,6 @@ import org.mockito.Mockito; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; /** @@ -45,12 +43,11 @@ public class TestFSDirAttrOp { when(fsd.getAccessTimePrecision()).thenReturn(precision); when(fsd.hasWriteLock()).thenReturn(Boolean.TRUE); - when(fsd.getINodesInPath(anyString(), anyBoolean())).thenReturn(iip); when(iip.getLastINode()).thenReturn(inode); when(iip.getLatestSnapshotId()).thenReturn(Mockito.anyInt()); when(inode.getAccessTime()).thenReturn(atime0); - return FSDirAttrOp.unprotectedSetTimes(fsd, "", mtime, atime, force); + return FSDirAttrOp.unprotectedSetTimes(fsd, iip, mtime, atime, force); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
