From 24f004b2f1627224b9c57c0a80649633d9e6da88 Mon Sep 17 00:00:00 2001 From: Craig Condit Date: Fri, 4 Dec 2020 14:36:27 -0600 Subject: [PATCH] Fixed flaky test, fixed thirdparty import --- .../squashfs/directory/DirectoryBuilder.java | 2 +- .../runc/squashfs/TestSquashFsInterop.java | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hadoop-tools/hadoop-runc/src/main/java/org/apache/hadoop/runc/squashfs/directory/DirectoryBuilder.java b/hadoop-tools/hadoop-runc/src/main/java/org/apache/hadoop/runc/squashfs/directory/DirectoryBuilder.java index a628b2a3defe8..98136d18f40c0 100644 --- a/hadoop-tools/hadoop-runc/src/main/java/org/apache/hadoop/runc/squashfs/directory/DirectoryBuilder.java +++ b/hadoop-tools/hadoop-runc/src/main/java/org/apache/hadoop/runc/squashfs/directory/DirectoryBuilder.java @@ -18,7 +18,7 @@ package org.apache.hadoop.runc.squashfs.directory; -import com.google.common.annotations.VisibleForTesting; +import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.runc.squashfs.inode.INodeType; import org.apache.hadoop.runc.squashfs.metadata.MetadataWriter; diff --git a/hadoop-tools/hadoop-runc/src/test/java/org/apache/hadoop/runc/squashfs/TestSquashFsInterop.java b/hadoop-tools/hadoop-runc/src/test/java/org/apache/hadoop/runc/squashfs/TestSquashFsInterop.java index 146495d1c6018..ffe9864cd50c4 100644 --- a/hadoop-tools/hadoop-runc/src/test/java/org/apache/hadoop/runc/squashfs/TestSquashFsInterop.java +++ b/hadoop-tools/hadoop-runc/src/test/java/org/apache/hadoop/runc/squashfs/TestSquashFsInterop.java @@ -406,9 +406,11 @@ public void archiveWithFileContainingFullBlockShouldWork() throws Exception { Random r = new Random(0L); r.nextBytes(content); + long modified = System.currentTimeMillis(); + try (SquashFsWriter writer = new SquashFsWriter(archive)) { SquashFsEntry entry = writer.entry("/full.dat") - .lastModified(Instant.now()) + .lastModified(Instant.ofEpochMilli(modified)) .uid(1000) .gid(2000) .content(new ByteArrayInputStream(content)) @@ -428,8 +430,8 @@ public void archiveWithFileContainingFullBlockShouldWork() throws Exception { assertEquals("wrong gid", (short) 2, entry.getGid()); assertEquals("wrong nlink count", 1, entry.getNlink()); assertEquals("wrong file size", 131072L, entry.getFileSize()); - assertEquals("wrong last modified", System.currentTimeMillis(), - entry.getLastModified() * 1000L, 10000L); + assertEquals("wrong last modified", + modified, entry.getLastModified() * 1000L, 10000L); assertEquals("wrong data block count", 1, entry.getDataBlocks().size()); assertNull("fragment found", entry.getFragment()); } @@ -1003,6 +1005,8 @@ public void fileWithNoFileSizeShouldFail() throws Exception { public void fileWithNoTimestampShouldUseDefault() throws Exception { File archive = temp.newFile(); + long timestamp = System.currentTimeMillis(); + try (SquashFsWriter writer = new SquashFsWriter(archive)) { SquashFsEntry entry = writer.entry("/no-timestamp.dat") .uid(0) @@ -1011,8 +1015,10 @@ public void fileWithNoTimestampShouldUseDefault() throws Exception { .permissions((short) 0644) .build(); - assertEquals("wrong timestamp", System.currentTimeMillis(), - entry.getLastModified() * 1000L, 10000L); + long actualTimestamp = entry.getLastModified() * 1000L; + + assertEquals("wrong timestamp", (double) timestamp, + (double) (entry.getLastModified() * 1000d), 60_000d); } }