Skip to content

Commit b386fe2

Browse files
committed
Create separate directories for zones
1 parent 650fde5 commit b386fe2

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

sled-agent/config-reconciler/src/dump_setup.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,16 +1802,18 @@ mod tests {
18021802
let tempdir = Utf8TempDir::new().unwrap();
18031803
let core_dir = tempdir.path().join(CRASH_DATASET);
18041804
let debug_dir = tempdir.path().join(DUMP_DATASET);
1805-
let zone_logs = tempdir.path().join("root/var/svc/log");
1806-
let adm_logs = tempdir.path().join("var/adm");
1805+
let zone_path = tempdir.path().join("myzone");
1806+
let zone_logs = zone_path.join("root/var/svc/log");
1807+
let global_path = tempdir.path().join("global");
1808+
let adm_logs = global_path.join("var/adm");
18071809

18081810
let tempdir_path = tempdir.path().as_str().to_string();
18091811
let global_zone = Zone::from_str(&format!(
1810-
"0:global:running:{tempdir_path}::ipkg:shared"
1812+
"0:global:running:{global_path}::ipkg:shared"
18111813
))
18121814
.unwrap();
18131815
let zone = Zone::from_str(&format!(
1814-
"1:myzone:running:{tempdir_path}::ipkg:shared"
1816+
"1:myzone:running:{zone_path}::ipkg:shared"
18151817
))
18161818
.unwrap();
18171819

@@ -1850,6 +1852,8 @@ mod tests {
18501852
tokio::sync::mpsc::channel(1).1,
18511853
);
18521854

1855+
tokio::fs::create_dir_all(&zone_path).await.unwrap();
1856+
tokio::fs::create_dir_all(&global_path).await.unwrap();
18531857
tokio::fs::create_dir_all(&core_dir).await.unwrap();
18541858
tokio::fs::create_dir_all(&debug_dir).await.unwrap();
18551859
tokio::fs::create_dir_all(&zone_logs).await.unwrap();

0 commit comments

Comments
 (0)