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 cn...@apache.org on 2016/01/13 00:57:23 UTC
[2/2] hadoop git commit: HADOOP-12603.
TestSymlinkLocalFSFileContext#testSetTimesSymlinkToDir occasionally fail.
Contributed by Wei-Chiu Chuang.
HADOOP-12603. TestSymlinkLocalFSFileContext#testSetTimesSymlinkToDir occasionally fail. Contributed by Wei-Chiu Chuang.
(cherry picked from commit d64cec0fdaddbb892d66ecff358f547b939005f1)
(cherry picked from commit 2605e78e44493a99a466a9264bf47f44176811ba)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c3f4cb92
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c3f4cb92
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c3f4cb92
Branch: refs/heads/branch-2.8
Commit: c3f4cb927a767fcc5e31c2973e602f7ad08138b6
Parents: 39f0729
Author: cnauroth <cn...@apache.org>
Authored: Tue Jan 12 15:41:36 2016 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Tue Jan 12 15:42:00 2016 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/test/java/org/apache/hadoop/fs/SymlinkBaseTest.java | 3 ++-
.../src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3f4cb92/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 5132265..09b676a 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -922,6 +922,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12584. Disable browsing the static directory in HttpServer2.
(Robert Kanter via aajisaka)
+ HADOOP-12603. TestSymlinkLocalFSFileContext#testSetTimesSymlinkToDir
+ occasionally fail. (Wei-Chiu Chuang via cnauroth)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3f4cb92/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/SymlinkBaseTest.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/SymlinkBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/SymlinkBaseTest.java
index 9d66732..007c37a 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/SymlinkBaseTest.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/SymlinkBaseTest.java
@@ -1388,7 +1388,8 @@ public abstract class SymlinkBaseTest {
long at = wrapper.getFileLinkStatus(link).getAccessTime();
// the local file system may not support millisecond timestamps
wrapper.setTimes(link, 2000L, 3000L);
- assertEquals(at, wrapper.getFileLinkStatus(link).getAccessTime());
+ assertTrue("The atime of symlink should not be lesser after setTimes()",
+ wrapper.getFileLinkStatus(link).getAccessTime() >= at);
assertEquals(2000, wrapper.getFileStatus(dir).getModificationTime());
assertEquals(3000, wrapper.getFileStatus(dir).getAccessTime());
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3f4cb92/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
index ab55f00..8968e7a 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
@@ -223,13 +223,13 @@ abstract public class TestSymlinkLocalFS extends SymlinkBaseTest {
@Override
public void testSetTimesSymlinkToFile() throws IOException {
- assumeTrue(!Path.WINDOWS);
+ assumeTrue(!Shell.WINDOWS && !Shell.SOLARIS);
super.testSetTimesSymlinkToFile();
}
@Override
public void testSetTimesSymlinkToDir() throws IOException {
- assumeTrue(!Path.WINDOWS);
+ assumeTrue(!Path.WINDOWS && !Shell.SOLARIS);
super.testSetTimesSymlinkToDir();
}