mirror of
https://github.com/astral-sh/uv.git
synced 2025-07-07 21:35:00 +00:00
Make "exit code" -> "exit status" a default filter
Remove some test boilerplate.
This commit is contained in:
konstin
parent
0fa6dce00e
commit
0f4434a7f5
8 changed files with 31 additions and 93 deletions
|
|
@ -15,7 +15,7 @@ fn build_basic() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
|
||||
.chain([(r"\\\.", "")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let project = context.temp_dir.child("project");
|
||||
|
|
@ -189,7 +189,7 @@ fn build_wheel() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
|
||||
.chain([(r"\\\.", "")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let project = context.temp_dir.child("project");
|
||||
|
|
@ -245,7 +245,7 @@ fn build_sdist_wheel() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
|
||||
.chain([(r"\\\.", "")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let project = context.temp_dir.child("project");
|
||||
|
|
@ -303,7 +303,7 @@ fn build_wheel_from_sdist() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
|
||||
.chain([(r"\\\.", "")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let project = context.temp_dir.child("project");
|
||||
|
|
@ -412,7 +412,7 @@ fn build_fail() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
|
||||
.chain([(r"\\\.", "")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let project = context.temp_dir.child("project");
|
||||
|
|
@ -488,7 +488,6 @@ fn build_workspace() -> Result<()> {
|
|||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"\\\.", ""),
|
||||
(r"\[project\]", "[PKG]"),
|
||||
(r"\[member\]", "[PKG]"),
|
||||
|
|
@ -694,7 +693,6 @@ fn build_all_with_failure() -> Result<()> {
|
|||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"\\\.", ""),
|
||||
(r"\[project\]", "[PKG]"),
|
||||
(r"\[member-\w+\]", "[PKG]"),
|
||||
|
|
@ -840,7 +838,7 @@ fn build_constraints() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
|
||||
.chain([(r"\\\.", "")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let project = context.temp_dir.child("project");
|
||||
|
|
@ -901,7 +899,7 @@ fn build_sha() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
|
||||
.chain([(r"\\\.", "")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let project = context.temp_dir.child("project");
|
||||
|
|
@ -1187,7 +1185,7 @@ fn build_tool_uv_sources() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
|
||||
.chain([(r"\\\.", "")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let build = context.temp_dir.child("backend");
|
||||
|
|
@ -1337,7 +1335,6 @@ fn build_non_package() -> Result<()> {
|
|||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"\\\.", ""),
|
||||
(r"\[project\]", "[PKG]"),
|
||||
(r"\[member\]", "[PKG]"),
|
||||
|
|
@ -1930,7 +1927,7 @@ fn build_with_nonnormalized_name() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
|
||||
.chain([(r"\\\.", "")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let project = context.temp_dir.child("project");
|
||||
|
|
@ -2022,13 +2019,7 @@ fn force_pep517() -> Result<()> {
|
|||
╰─▶ Expected a Python module at: `src/does_not_exist/__init__.py`
|
||||
");
|
||||
|
||||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([(r"exit code: 1", "exit status: 1")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.build().arg("--force-pep517").env("RUST_BACKTRACE", "0"), @r"
|
||||
uv_snapshot!(context.filters(), context.build().arg("--force-pep517").env("RUST_BACKTRACE", "0"), @r"
|
||||
success: false
|
||||
exit_code: 2
|
||||
----- stdout -----
|
||||
|
|
|
|||
|
|
@ -517,6 +517,8 @@ impl TestContext {
|
|||
if cfg!(windows) {
|
||||
filters.push((" --link-mode <LINK_MODE>".to_string(), String::new()));
|
||||
filters.push((r#"link-mode = "copy"\n"#.to_string(), String::new()));
|
||||
// Unix uses "exit status", Windows uses "exit code"
|
||||
filters.push((r"exit code: ".to_string(), "exit status: ".to_string()));
|
||||
}
|
||||
|
||||
filters.extend(
|
||||
|
|
|
|||
|
|
@ -7246,10 +7246,7 @@ fn fail_to_add_revert_project() -> Result<()> {
|
|||
.child("setup.py")
|
||||
.write_str("1/0")?;
|
||||
|
||||
let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
|
||||
.chain(context.filters())
|
||||
.collect::<Vec<_>>();
|
||||
uv_snapshot!(filters, context.add().arg("./child"), @r#"
|
||||
uv_snapshot!(context.filters(), context.add().arg("./child"), @r#"
|
||||
success: false
|
||||
exit_code: 1
|
||||
----- stdout -----
|
||||
|
|
@ -7351,10 +7348,7 @@ fn fail_to_edit_revert_project() -> Result<()> {
|
|||
.child("setup.py")
|
||||
.write_str("1/0")?;
|
||||
|
||||
let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
|
||||
.chain(context.filters())
|
||||
.collect::<Vec<_>>();
|
||||
uv_snapshot!(filters, context.add().arg("./child"), @r#"
|
||||
uv_snapshot!(context.filters(), context.add().arg("./child"), @r#"
|
||||
success: false
|
||||
exit_code: 1
|
||||
----- stdout -----
|
||||
|
|
|
|||
|
|
@ -23617,10 +23617,7 @@ fn lock_derivation_chain_prod() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"/.*/src", "/[TMP]/src"),
|
||||
])
|
||||
.chain([(r"/.*/src", "/[TMP]/src")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.lock(), @r###"
|
||||
|
|
@ -23677,10 +23674,7 @@ fn lock_derivation_chain_extra() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"/.*/src", "/[TMP]/src"),
|
||||
])
|
||||
.chain([(r"/.*/src", "/[TMP]/src")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.lock(), @r###"
|
||||
|
|
@ -23739,10 +23733,7 @@ fn lock_derivation_chain_group() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"/.*/src", "/[TMP]/src"),
|
||||
])
|
||||
.chain([(r"/.*/src", "/[TMP]/src")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.lock(), @r###"
|
||||
|
|
@ -23812,10 +23803,7 @@ fn lock_derivation_chain_extended() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"/.*/src", "/[TMP]/src"),
|
||||
])
|
||||
.chain([(r"/.*/src", "/[TMP]/src")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.lock(), @r###"
|
||||
|
|
|
|||
|
|
@ -14679,10 +14679,7 @@ fn compile_derivation_chain() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"/.*/src", "/[TMP]/src"),
|
||||
])
|
||||
.chain([(r"/.*/src", "/[TMP]/src")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.pip_compile().arg("pyproject.toml"), @r###"
|
||||
|
|
|
|||
|
|
@ -342,10 +342,7 @@ dependencies = ["flask==1.0.x"]
|
|||
let requirements_txt = context.temp_dir.child("requirements.txt");
|
||||
requirements_txt.write_str("./path_dep")?;
|
||||
|
||||
let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
|
||||
.chain(context.filters())
|
||||
.collect::<Vec<_>>();
|
||||
uv_snapshot!(filters, context.pip_install()
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-r")
|
||||
.arg("requirements.txt"), @r###"
|
||||
success: false
|
||||
|
|
@ -4930,10 +4927,7 @@ fn no_build_isolation() -> Result<()> {
|
|||
requirements_in.write_str("anyio @ https://files.pythonhosted.org/packages/db/4d/3970183622f0330d3c23d9b8a5f52e365e50381fd484d08e3285104333d3/anyio-4.3.0.tar.gz")?;
|
||||
|
||||
// We expect the build to fail, because `setuptools` is not installed.
|
||||
let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
|
||||
.chain(context.filters())
|
||||
.collect::<Vec<_>>();
|
||||
uv_snapshot!(filters, context.pip_install()
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-r")
|
||||
.arg("requirements.in")
|
||||
.arg("--no-build-isolation"), @r###"
|
||||
|
|
@ -5001,10 +4995,7 @@ fn respect_no_build_isolation_env_var() -> Result<()> {
|
|||
requirements_in.write_str("anyio @ https://files.pythonhosted.org/packages/db/4d/3970183622f0330d3c23d9b8a5f52e365e50381fd484d08e3285104333d3/anyio-4.3.0.tar.gz")?;
|
||||
|
||||
// We expect the build to fail, because `setuptools` is not installed.
|
||||
let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
|
||||
.chain(context.filters())
|
||||
.collect::<Vec<_>>();
|
||||
uv_snapshot!(filters, context.pip_install()
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-r")
|
||||
.arg("requirements.in")
|
||||
.env(EnvVars::UV_NO_BUILD_ISOLATION, "yes"), @r###"
|
||||
|
|
@ -8601,10 +8592,7 @@ fn install_build_isolation_package() -> Result<()> {
|
|||
)?;
|
||||
|
||||
// Running `uv pip install` should fail for iniconfig.
|
||||
let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
|
||||
.chain(context.filters())
|
||||
.collect::<Vec<_>>();
|
||||
uv_snapshot!(filters, context.pip_install()
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("--no-build-isolation-package")
|
||||
.arg("iniconfig")
|
||||
.arg(package.path()), @r###"
|
||||
|
|
@ -8931,10 +8919,7 @@ fn missing_top_level() {
|
|||
fn sklearn() {
|
||||
let context = TestContext::new("3.12");
|
||||
|
||||
let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
|
||||
.chain(context.filters())
|
||||
.collect::<Vec<_>>();
|
||||
uv_snapshot!(filters, context.pip_install().arg("sklearn"), @r###"
|
||||
uv_snapshot!(context.filters(), context.pip_install().arg("sklearn"), @r###"
|
||||
success: false
|
||||
exit_code: 1
|
||||
----- stdout -----
|
||||
|
|
@ -8984,10 +8969,7 @@ fn resolve_derivation_chain() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"/.*/src", "/[TMP]/src"),
|
||||
])
|
||||
.chain([(r"/.*/src", "/[TMP]/src")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.pip_install()
|
||||
|
|
|
|||
|
|
@ -1122,10 +1122,7 @@ fn sync_build_isolation_package() -> Result<()> {
|
|||
)?;
|
||||
|
||||
// Running `uv sync` should fail for iniconfig.
|
||||
let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
|
||||
.chain(context.filters())
|
||||
.collect::<Vec<_>>();
|
||||
uv_snapshot!(filters, context.sync().arg("--no-build-isolation-package").arg("source-distribution"), @r###"
|
||||
uv_snapshot!(context.filters(), context.sync().arg("--no-build-isolation-package").arg("source-distribution"), @r###"
|
||||
success: false
|
||||
exit_code: 1
|
||||
----- stdout -----
|
||||
|
|
@ -1215,10 +1212,7 @@ fn sync_build_isolation_extra() -> Result<()> {
|
|||
)?;
|
||||
|
||||
// Running `uv sync` should fail for the `compile` extra.
|
||||
let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
|
||||
.chain(context.filters())
|
||||
.collect::<Vec<_>>();
|
||||
uv_snapshot!(&filters, context.sync().arg("--extra").arg("compile"), @r###"
|
||||
uv_snapshot!(context.filters(), context.sync().arg("--extra").arg("compile"), @r###"
|
||||
success: false
|
||||
exit_code: 1
|
||||
----- stdout -----
|
||||
|
|
@ -1239,7 +1233,7 @@ fn sync_build_isolation_extra() -> Result<()> {
|
|||
"###);
|
||||
|
||||
// Running `uv sync` with `--all-extras` should also fail.
|
||||
uv_snapshot!(&filters, context.sync().arg("--all-extras"), @r###"
|
||||
uv_snapshot!(context.filters(), context.sync().arg("--all-extras"), @r###"
|
||||
success: false
|
||||
exit_code: 1
|
||||
----- stdout -----
|
||||
|
|
@ -6985,10 +6979,7 @@ fn sync_derivation_chain() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"/.*/src", "/[TMP]/src"),
|
||||
])
|
||||
.chain([(r"/.*/src", "/[TMP]/src")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.sync(), @r###"
|
||||
|
|
@ -7051,10 +7042,7 @@ fn sync_derivation_chain_extra() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"/.*/src", "/[TMP]/src"),
|
||||
])
|
||||
.chain([(r"/.*/src", "/[TMP]/src")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.sync().arg("--extra").arg("wsgi"), @r###"
|
||||
|
|
@ -7119,10 +7107,7 @@ fn sync_derivation_chain_group() -> Result<()> {
|
|||
let filters = context
|
||||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"/.*/src", "/[TMP]/src"),
|
||||
])
|
||||
.chain([(r"/.*/src", "/[TMP]/src")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.sync().arg("--group").arg("wsgi"), @r###"
|
||||
|
|
|
|||
|
|
@ -1682,7 +1682,6 @@ fn tool_install_uninstallable() {
|
|||
.filters()
|
||||
.into_iter()
|
||||
.chain([
|
||||
(r"exit code: 1", "exit status: 1"),
|
||||
(r"bdist\.[^/\\\s]+(-[^/\\\s]+)?", "bdist.linux-x86_64"),
|
||||
(r"\\\.", ""),
|
||||
(r"#+", "#"),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue