You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2016/12/22 18:57:56 UTC
hadoop git commit: HDFS-11258. Addendum patch to fix compile issue.
Contributed by Jimmy Xiang.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 3ba589cd1 -> 16c4dcad8
HDFS-11258. Addendum patch to fix compile issue. Contributed by Jimmy Xiang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/16c4dcad
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16c4dcad
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16c4dcad
Branch: refs/heads/branch-2
Commit: 16c4dcad854059f63fd3052b3c006ac6130fab8c
Parents: 3ba589c
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Dec 23 03:56:12 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Dec 23 03:56:12 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/16c4dcad/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org