mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-09-29 13:34:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

test: pip_list: Fix replacement pattern computation (#2237)

Browse source 
## Summary

Fix computing replacements pattern for pip_list tests to count
characters in the original directory string rather than the
regex::escape'd string. The latter yields incorrect results if the
workspace path contains characters such as `-` or `.`.

Fixes #2232

## Test Plan

`cargo test --test pip_list` in a directory named `uv-test` to provoke
the bug.
This commit is contained in:
Michał Górny 2024-03-06 14:32:07 +01:00 • committed by GitHub
parent 3ca777673f
commit c6af78d153
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
crates/uv/tests/pip_list.rs
View file

@ -98,13 +98,11 @@ fn list_editable() -> Result<()> {
let context = TestContext::new("3.12"); let context = TestContext::new("3.12");
let current_dir = std::env::current_dir()?; let current_dir = std::env::current_dir()?;
let workspace_dir = regex::escape( let workspace_dir =
Url::from_directory_path(current_dir.join("..").join("..").canonicalize()?) Url::from_directory_path(current_dir.join("..").join("..").canonicalize()?).unwrap();
.unwrap() let workspace_dir_re = regex::escape(workspace_dir.as_str());
.as_str(),
);
let filters = [(workspace_dir.as_str(), "file://[WORKSPACE_DIR]/")] let filters = [(workspace_dir_re.as_str(), "file://[WORKSPACE_DIR]/")]
.into_iter() .into_iter()
.chain(INSTA_FILTERS.to_vec()) .chain(INSTA_FILTERS.to_vec())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -159,7 +157,7 @@ fn list_editable() -> Result<()> {
let find_whitespace = " ".repeat(25 + workspace_len_difference); let find_whitespace = " ".repeat(25 + workspace_len_difference);
let replace_whitespace = " ".repeat(57); let replace_whitespace = " ".repeat(57);
let search_workspace = workspace_dir.as_str().strip_prefix(prefix).unwrap(); let search_workspace = workspace_dir_re.as_str().strip_prefix(prefix).unwrap();
let replace_workspace = "[WORKSPACE_DIR]/"; let replace_workspace = "[WORKSPACE_DIR]/";
let filters = INSTA_FILTERS let filters = INSTA_FILTERS
@ -200,13 +198,11 @@ fn list_editable_only() -> Result<()> {
let context = TestContext::new("3.12"); let context = TestContext::new("3.12");
let current_dir = std::env::current_dir()?; let current_dir = std::env::current_dir()?;
let workspace_dir = regex::escape( let workspace_dir =
Url::from_directory_path(current_dir.join("..").join("..").canonicalize()?) Url::from_directory_path(current_dir.join("..").join("..").canonicalize()?).unwrap();
.unwrap() let workspace_dir_re = regex::escape(workspace_dir.as_str());
.as_str(),
);
let filters = [(workspace_dir.as_str(), "file://[WORKSPACE_DIR]/")] let filters = [(workspace_dir_re.as_str(), "file://[WORKSPACE_DIR]/")]
.into_iter() .into_iter()
.chain(INSTA_FILTERS.to_vec()) .chain(INSTA_FILTERS.to_vec())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -254,7 +250,7 @@ fn list_editable_only() -> Result<()> {
let find_whitespace = " ".repeat(25 + workspace_len_difference); let find_whitespace = " ".repeat(25 + workspace_len_difference);
let replace_whitespace = " ".repeat(57); let replace_whitespace = " ".repeat(57);
let search_workspace = workspace_dir.as_str().strip_prefix(prefix).unwrap(); let search_workspace = workspace_dir_re.as_str().strip_prefix(prefix).unwrap();
let replace_workspace = "[WORKSPACE_DIR]/"; let replace_workspace = "[WORKSPACE_DIR]/";
let filters = INSTA_FILTERS let filters = INSTA_FILTERS
@ -331,13 +327,11 @@ fn list_exclude() -> Result<()> {
let context = TestContext::new("3.12"); let context = TestContext::new("3.12");
let current_dir = std::env::current_dir()?; let current_dir = std::env::current_dir()?;
let workspace_dir = regex::escape( let workspace_dir =
Url::from_directory_path(current_dir.join("..").join("..").canonicalize()?) Url::from_directory_path(current_dir.join("..").join("..").canonicalize()?).unwrap();
.unwrap() let workspace_dir_re = regex::escape(workspace_dir.as_str());
.as_str(),
);
let filters = [(workspace_dir.as_str(), "file://[WORKSPACE_DIR]/")] let filters = [(workspace_dir_re.as_str(), "file://[WORKSPACE_DIR]/")]
.into_iter() .into_iter()
.chain(INSTA_FILTERS.to_vec()) .chain(INSTA_FILTERS.to_vec())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -385,7 +379,7 @@ fn list_exclude() -> Result<()> {
let find_whitespace = " ".repeat(25 + workspace_len_difference); let find_whitespace = " ".repeat(25 + workspace_len_difference);
let replace_whitespace = " ".repeat(57); let replace_whitespace = " ".repeat(57);
let search_workspace = workspace_dir.as_str().strip_prefix(prefix).unwrap(); let search_workspace = workspace_dir_re.as_str().strip_prefix(prefix).unwrap();
let replace_workspace = "[WORKSPACE_DIR]/"; let replace_workspace = "[WORKSPACE_DIR]/";
let filters = INSTA_FILTERS let filters = INSTA_FILTERS