HADOOP-12849. TestSymlinkLocalFSFileSystem fails intermittently. Contributed by 
Mingliang Liu.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/798babf6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/798babf6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/798babf6

Branch: refs/heads/HDFS-1312
Commit: 798babf661311264fa895c89a33d0f2da927da33
Parents: 0f72da7
Author: Chris Nauroth <[email protected]>
Authored: Fri Feb 26 21:59:08 2016 -0800
Committer: Chris Nauroth <[email protected]>
Committed: Fri Feb 26 21:59:08 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/798babf6/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 106dc64..79cf4d5 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1752,6 +1752,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/798babf6/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);
   }
 }

Reply via email to