Skip to content

Commit 51f9e73

Browse files
committed
undo unpack_multiple_sources_into_the_same_destination_with_merge test
Signed-off-by: tommady <[email protected]>
1 parent 2fa3fa2 commit 51f9e73

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

tests/integration.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -813,14 +813,13 @@ fn unpack_multiple_sources_into_the_same_destination_with_merge(
813813
let temp_dir = tempdir()?;
814814
let root_path = temp_dir.path();
815815
let source_path = root_path
816-
.join(format!("example_{}", merge_extensions(ext, &extra_extensions)))
816+
.join(format!("example_{}", merge_extensions(&ext, &extra_extensions)))
817817
.join("sub_a")
818818
.join("sub_b")
819819
.join("sub_c");
820820

821821
fs::create_dir_all(&source_path)?;
822-
823-
let archive = root_path.join(format!("archive.{}", merge_extensions(ext, &extra_extensions)));
822+
let archive = root_path.join(format!("archive.{}", merge_extensions(&ext, &extra_extensions)));
824823
crate::utils::cargo_bin()
825824
.arg("compress")
826825
.args([
@@ -834,8 +833,7 @@ fn unpack_multiple_sources_into_the_same_destination_with_merge(
834833

835834
fs::remove_dir_all(&source_path)?;
836835
fs::create_dir_all(&source_path)?;
837-
838-
let archive1 = root_path.join(format!("archive1.{}", merge_extensions(ext, &extra_extensions)));
836+
let archive1 = root_path.join(format!("archive1.{}", merge_extensions(&ext, &extra_extensions)));
839837
crate::utils::cargo_bin()
840838
.arg("compress")
841839
.args([
@@ -847,7 +845,7 @@ fn unpack_multiple_sources_into_the_same_destination_with_merge(
847845
.assert()
848846
.success();
849847

850-
let out_path = root_path.join(format!("out_{}", merge_extensions(ext, &extra_extensions)));
848+
let out_path = root_path.join(format!("out_{}", merge_extensions(&ext, &extra_extensions)));
851849
fs::create_dir_all(&out_path)?;
852850

853851
crate::utils::cargo_bin()

0 commit comments

Comments
 (0)