mirror of
https://github.com/ouch-org/ouch.git
synced 2025-06-06 19:45:29 +00:00
fix merge main branch then the test case failed
Signed-off-by: tommady <tommady@users.noreply.github.com>
This commit is contained in:
parent
9f5237f726
commit
b6bf1fa7e0
@ -387,7 +387,7 @@ fn smart_unpack_with_single_file(
|
|||||||
})
|
})
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
let archive = &root_path.join(format!("archive.{}", merge_extensions(&ext, extra_extensions)));
|
let archive = &root_path.join(format!("archive.{}", merge_extensions(&ext, &extra_extensions)));
|
||||||
|
|
||||||
crate::utils::cargo_bin()
|
crate::utils::cargo_bin()
|
||||||
.arg("compress")
|
.arg("compress")
|
||||||
@ -438,7 +438,7 @@ fn smart_unpack_with_multiple_files(
|
|||||||
.map(|entry| entry.unwrap().path())
|
.map(|entry| entry.unwrap().path())
|
||||||
.collect::<Vec<PathBuf>>();
|
.collect::<Vec<PathBuf>>();
|
||||||
|
|
||||||
let archive = &root_path.join(format!("archive.{}", merge_extensions(&ext, extra_extensions)));
|
let archive = &root_path.join(format!("archive.{}", merge_extensions(&ext, &extra_extensions)));
|
||||||
|
|
||||||
let output_path = root_path.join("archive");
|
let output_path = root_path.join("archive");
|
||||||
assert!(!output_path.exists());
|
assert!(!output_path.exists());
|
||||||
@ -487,7 +487,7 @@ fn no_smart_unpack_with_single_file(
|
|||||||
.map(|entry| entry.unwrap().path())
|
.map(|entry| entry.unwrap().path())
|
||||||
.collect::<Vec<PathBuf>>();
|
.collect::<Vec<PathBuf>>();
|
||||||
|
|
||||||
let archive = &root_path.join(format!("archive.{}", merge_extensions(&ext, extra_extensions)));
|
let archive = &root_path.join(format!("archive.{}", merge_extensions(&ext, &extra_extensions)));
|
||||||
|
|
||||||
let output_path = root_path.join("archive");
|
let output_path = root_path.join("archive");
|
||||||
assert!(!output_path.exists());
|
assert!(!output_path.exists());
|
||||||
@ -537,7 +537,7 @@ fn no_smart_unpack_with_multiple_files(
|
|||||||
.map(|entry| entry.unwrap().path())
|
.map(|entry| entry.unwrap().path())
|
||||||
.collect::<Vec<PathBuf>>();
|
.collect::<Vec<PathBuf>>();
|
||||||
|
|
||||||
let archive = &root_path.join(format!("archive.{}", merge_extensions(&ext, extra_extensions)));
|
let archive = &root_path.join(format!("archive.{}", merge_extensions(&ext, &extra_extensions)));
|
||||||
|
|
||||||
let output_path = root_path.join("archive");
|
let output_path = root_path.join("archive");
|
||||||
assert!(!output_path.exists());
|
assert!(!output_path.exists());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user