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/02/27 07:10:18 UTC
[3/3] hadoop git commit: HADOOP-12849. TestSymlinkLocalFSFileSystem
fails intermittently. Contributed by Mingliang Liu.
HADOOP-12849. TestSymlinkLocalFSFileSystem fails intermittently. Contributed by Mingliang Liu.
(cherry picked from commit 798babf661311264fa895c89a33d0f2da927da33)
(cherry picked from commit c692d7c52fa83da28ae69da164b4177456e21d76)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d55863de
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d55863de
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d55863de
Branch: refs/heads/branch-2.8
Commit: d55863de0ffd6df9ff93880b91a81b57df5c496e
Parents: 5b95971
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Feb 26 21:59:08 2016 -0800
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Feb 26 21:59:20 2016 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/test/java/org/apache/hadoop/fs/SymlinkBaseTest.java | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d55863de/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 ca33282..44d8781 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1041,6 +1041,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12716. KerberosAuthenticator#doSpnegoSequence use incorrect class to
determine isKeyTab in JDK8. (Xiaoyu Yao via cnauroth)
+ HADOOP-12849. TestSymlinkLocalFSFileSystem fails intermittently.
+ (Mingliang Liu via cnauroth)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d55863de/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 007c37a..a5808e6 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
@@ -1373,7 +1373,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(file).getModificationTime());
assertEquals(3000, wrapper.getFileStatus(file).getAccessTime());
}
@@ -1407,6 +1408,7 @@ public abstract class SymlinkBaseTest {
} catch (IOException e) {
// Expected
}
- assertEquals(at, wrapper.getFileLinkStatus(link).getAccessTime());
+ assertTrue("The atime of symlink should not be lesser after setTimes()",
+ wrapper.getFileLinkStatus(link).getAccessTime() >= at);
}
}