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

(cherry picked from commit 798babf661)
(cherry picked from commit c692d7c52f)
This commit is contained in:
Chris Nauroth 2016-02-26 21:59:08 -08:00
parent 5b95971f8a
commit d55863de0f
2 changed files with 7 additions and 2 deletions

View File

@ -1041,6 +1041,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12716. KerberosAuthenticator#doSpnegoSequence use incorrect class to HADOOP-12716. KerberosAuthenticator#doSpnegoSequence use incorrect class to
determine isKeyTab in JDK8. (Xiaoyu Yao via cnauroth) determine isKeyTab in JDK8. (Xiaoyu Yao via cnauroth)
HADOOP-12849. TestSymlinkLocalFSFileSystem fails intermittently.
(Mingliang Liu via cnauroth)
Release 2.7.3 - UNRELEASED Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -1373,7 +1373,8 @@ public void testSetTimesSymlinkToFile() throws IOException {
long at = wrapper.getFileLinkStatus(link).getAccessTime(); long at = wrapper.getFileLinkStatus(link).getAccessTime();
// the local file system may not support millisecond timestamps // the local file system may not support millisecond timestamps
wrapper.setTimes(link, 2000L, 3000L); 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(2000, wrapper.getFileStatus(file).getModificationTime());
assertEquals(3000, wrapper.getFileStatus(file).getAccessTime()); assertEquals(3000, wrapper.getFileStatus(file).getAccessTime());
} }
@ -1407,6 +1408,7 @@ public void testSetTimesDanglingLink() throws IOException {
} catch (IOException e) { } catch (IOException e) {
// Expected // Expected
} }
assertEquals(at, wrapper.getFileLinkStatus(link).getAccessTime()); assertTrue("The atime of symlink should not be lesser after setTimes()",
wrapper.getFileLinkStatus(link).getAccessTime() >= at);
} }
} }