Skip to content

Make generated test archive deterministic #3420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cragkhit wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −3
Open

Make generated test archive deterministic #3420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...el-config/src/test/java/com/yahoo/elide/modelconfig/verify/DynamicConfigVerifierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.security.SecureRandom;
import java.security.Signature;
import java.util.Base64;
import java.util.Arrays;

public class DynamicConfigVerifierTest {

Expand Down Expand Up @@ -131,9 +132,13 @@ private static void createTarGZ() throws FileNotFoundException, IOException {
TarArchiveOutputStream tarOutputStream = null;
try {
String configPath = "src/test/resources/configs/";
File[] files = new File(configPath).listFiles();
Arrays.sort(files);
tarOutputStream = new TarArchiveOutputStream(new GzipCompressorOutputStream(
new BufferedOutputStream(new FileOutputStream(new File(TAR_FILE_PATH)))));
addFileToTarGz(tarOutputStream, configPath, "");
for (File file : files) {
addFileToTarGz(tarOutputStream, file.getAbsolutePath(), "");
}
} finally {
tarOutputStream.finish();
tarOutputStream.close();
Expand All @@ -144,15 +149,16 @@ private static void addFileToTarGz(TarArchiveOutputStream tOut, String path, Str
File f = new File(path);
String entryName = base + f.getName();
TarArchiveEntry tarEntry = new TarArchiveEntry(f, entryName);
tOut.putArchiveEntry(tarEntry);

if (f.isFile()) {
tarEntry.setModTime(0);
tOut.putArchiveEntry(tarEntry);
IOUtils.copy(new FileInputStream(f), tOut);
tOut.closeArchiveEntry();
Comment on lines +155 to 157
} else {
tOut.closeArchiveEntry();
File[] children = f.listFiles();
if (children != null) {
Arrays.sort(children);
for (File child : children) {
addFileToTarGz(tOut, child.getAbsolutePath(), entryName + "/");
}
Expand Down