hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [11/43] hadoop git commit: HADOOP-12603. TestSymlinkLocalFSFileContext#testSetTimesSymlinkToDir occasionally fail. Contributed by Wei-Chiu Chuang.
Date Sat, 16 Jan 2016 00:10:37 GMT
HADOOP-12603. TestSymlinkLocalFSFileContext#testSetTimesSymlinkToDir occasionally fail. Contributed
by Wei-Chiu Chuang.


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

Branch: refs/heads/HDFS-1312
Commit: fbb5868deb6a714c548887f3b42119b256d9d69b
Parents: f657b54
Author: cnauroth <cnauroth@apache.org>
Authored: Tue Jan 12 15:41:36 2016 -0800
Committer: cnauroth <cnauroth@apache.org>
Committed: Tue Jan 12 15:57:32 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/fbb5868d/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 e7b0e5d..35e20ae 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1592,6 +1592,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/fbb5868d/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/fbb5868d/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();
   }
 


Mime
View raw message