Skip to content

Commit 68d5754

Browse files
committed
fix: prevent conflicts between tests that verify the archive produced using a CompressedArchiveSnapshotter implementation.
Also remove useless `Arc::new()` in `should_create_a_valid_archive_with_gzip_snapshotter` and `should_create_a_valid_archive_with_zstandard_snapshotter` tests.
1 parent 96f1b51 commit 68d5754

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

mithril-aggregator/src/services/snapshotter/appender.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ impl TarAppender for AppenderEntries {
7070
mod tests {
7171
use std::path::Path;
7272

73+
use uuid::Uuid;
74+
7375
use crate::services::snapshotter::test_tools::*;
7476
use crate::services::{
7577
CompressedArchiveSnapshotter, Snapshotter, SnapshotterCompressionAlgorithm,
@@ -89,13 +91,14 @@ mod tests {
8991
let directory_not_to_archive_path = create_dir(&source, "directory_not_to_archive");
9092
let file_not_to_archive_path = create_file(&source, "file_not_to_archive.txt");
9193

92-
let snapshotter = CompressedArchiveSnapshotter::new(
94+
let mut snapshotter = CompressedArchiveSnapshotter::new(
9395
source,
9496
destination,
9597
SnapshotterCompressionAlgorithm::Gzip,
9698
TestLogger::stdout(),
9799
)
98100
.unwrap();
101+
snapshotter.set_sub_temp_dir(Uuid::new_v4().to_string());
99102

100103
let snapshot = snapshotter
101104
.snapshot_subset(
@@ -165,13 +168,14 @@ mod tests {
165168
let directory_to_archive_path = create_dir(&source, "directory_to_archive");
166169
let file_to_archive_path = create_file(&source, "directory_to_archive/file_to_archive.txt");
167170

168-
let snapshotter = CompressedArchiveSnapshotter::new(
171+
let mut snapshotter = CompressedArchiveSnapshotter::new(
169172
source,
170173
destination,
171174
SnapshotterCompressionAlgorithm::Gzip,
172175
TestLogger::stdout(),
173176
)
174177
.unwrap();
178+
snapshotter.set_sub_temp_dir(Uuid::new_v4().to_string());
175179

176180
let snapshot = snapshotter
177181
.snapshot_subset(

mithril-aggregator/src/services/snapshotter/compressed_archive_snapshotter.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,8 @@ impl CompressedArchiveSnapshotter {
348348
mod tests {
349349
use std::sync::Arc;
350350

351+
use uuid::Uuid;
352+
351353
use mithril_common::digesters::DummyCardanoDbBuilder;
352354

353355
use mithril_common::test_utils::assert_equivalent;
@@ -486,15 +488,14 @@ mod tests {
486488
.append_immutable_trio()
487489
.build();
488490

489-
let snapshotter = Arc::new(
490-
CompressedArchiveSnapshotter::new(
491-
db_directory.clone(),
492-
pending_snapshot_directory.clone(),
493-
SnapshotterCompressionAlgorithm::Gzip,
494-
TestLogger::stdout(),
495-
)
496-
.unwrap(),
497-
);
491+
let mut snapshotter = CompressedArchiveSnapshotter::new(
492+
db_directory.clone(),
493+
pending_snapshot_directory.clone(),
494+
SnapshotterCompressionAlgorithm::Gzip,
495+
TestLogger::stdout(),
496+
)
497+
.unwrap();
498+
snapshotter.set_sub_temp_dir(Uuid::new_v4().to_string());
498499

499500
let appender = AppenderDirAll { db_directory };
500501
snapshotter
@@ -527,15 +528,14 @@ mod tests {
527528
.append_immutable_trio()
528529
.build();
529530

530-
let snapshotter = Arc::new(
531-
CompressedArchiveSnapshotter::new(
532-
db_directory.clone(),
533-
pending_snapshot_directory.clone(),
534-
ZstandardCompressionParameters::default().into(),
535-
TestLogger::stdout(),
536-
)
537-
.unwrap(),
538-
);
531+
let mut snapshotter = CompressedArchiveSnapshotter::new(
532+
db_directory.clone(),
533+
pending_snapshot_directory.clone(),
534+
ZstandardCompressionParameters::default().into(),
535+
TestLogger::stdout(),
536+
)
537+
.unwrap();
538+
snapshotter.set_sub_temp_dir(Uuid::new_v4().to_string());
539539

540540
let appender = AppenderDirAll { db_directory };
541541
snapshotter

0 commit comments

Comments
 (0)