itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(git): Fix masquerade feature list for shallow fetch

Browse Source
This commit is contained in:
Ed Page 2024-12-18 11:22:59 -06:00
parent 89b89bde65
commit 4cc7ff5ab5
1 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tests/testsuite/git_shallow.rs
View File

@ -102,9 +102,7 @@ fn perform_two_revs_same_deps(mode: RepoMode) {
RepoMode::Shallow => "build -v -Zgitoxide=fetch -Zgit=shallow-deps", RepoMode::Shallow => "build -v -Zgitoxide=fetch -Zgit=shallow-deps",
}; };
foo.cargo(args) foo.cargo(args)
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
assert!(foo.bin("foo").is_file()); assert!(foo.bin("foo").is_file());
foo.process(&foo.bin("foo")).run(); foo.process(&foo.bin("foo")).run();
@ -131,9 +129,7 @@ fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_with_git2_fetch(
p.cargo("fetch") p.cargo("fetch")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-index") .arg("-Zgit=shallow-index")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
let shallow_repo = gix::open_opts(find_index(), gix::open::Options::isolated())?; let shallow_repo = gix::open_opts(find_index(), gix::open::Options::isolated())?;
@ -214,9 +210,7 @@ fn gitoxide_clones_git_dependency_with_shallow_protocol_and_git2_is_used_for_fol
p.cargo("update") p.cargo("update")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-deps") .arg("-Zgit=shallow-deps")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
let db_clone = gix::open_opts( let db_clone = gix::open_opts(
@ -352,9 +346,7 @@ fn gitoxide_shallow_clone_followed_by_non_shallow_update() -> anyhow::Result<()>
p.cargo("update") p.cargo("update")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-deps") .arg("-Zgit=shallow-deps")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
let shallow_db_clone = gix::open_opts( let shallow_db_clone = gix::open_opts(
@ -398,7 +390,7 @@ fn gitoxide_shallow_clone_followed_by_non_shallow_update() -> anyhow::Result<()>
p.cargo("update") p.cargo("update")
.arg("-Zgitoxide=fetch") // shallow-deps is omitted intentionally .arg("-Zgitoxide=fetch") // shallow-deps is omitted intentionally
.masquerade_as_nightly_cargo(&["unstable features must be available for -Z gitoxide"]) .masquerade_as_nightly_cargo(&["gitoxide=fetch"])
.run(); .run();
let db_clone = gix::open_opts( let db_clone = gix::open_opts(
@ -471,9 +463,7 @@ fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_fetch_maintains_
p.cargo("fetch") p.cargo("fetch")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-index") .arg("-Zgit=shallow-index")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
let repo = gix::open_opts(find_index(), gix::open::Options::isolated())?; let repo = gix::open_opts(find_index(), gix::open::Options::isolated())?;
@ -491,9 +481,7 @@ fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_fetch_maintains_
p.cargo("update") p.cargo("update")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-index") // NOTE: the flag needs to be consistent or else a different index is created .arg("-Zgit=shallow-index") // NOTE: the flag needs to be consistent or else a different index is created
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
assert_eq!( assert_eq!(
@ -511,9 +499,7 @@ fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_fetch_maintains_
p.cargo("update") p.cargo("update")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-index") .arg("-Zgit=shallow-index")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
assert_eq!( assert_eq!(
@ -550,7 +536,7 @@ fn gitoxide_clones_registry_without_shallow_protocol_and_follow_up_fetch_uses_sh
.build(); .build();
p.cargo("fetch") p.cargo("fetch")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.masquerade_as_nightly_cargo(&["unstable features must be available for -Z gitoxide"]) .masquerade_as_nightly_cargo(&["gitoxide=fetch"])
.run(); .run();
let repo = gix::open_opts(find_index(), gix::open::Options::isolated())?; let repo = gix::open_opts(find_index(), gix::open::Options::isolated())?;
@ -568,9 +554,7 @@ fn gitoxide_clones_registry_without_shallow_protocol_and_follow_up_fetch_uses_sh
p.cargo("update") p.cargo("update")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-index") .arg("-Zgit=shallow-index")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
let shallow_repo = gix::open_opts( let shallow_repo = gix::open_opts(
@ -592,9 +576,7 @@ fn gitoxide_clones_registry_without_shallow_protocol_and_follow_up_fetch_uses_sh
p.cargo("update") p.cargo("update")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-index") .arg("-Zgit=shallow-index")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
assert_eq!( assert_eq!(
@ -610,7 +592,7 @@ fn gitoxide_clones_registry_without_shallow_protocol_and_follow_up_fetch_uses_sh
p.cargo("update") p.cargo("update")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.masquerade_as_nightly_cargo(&["unstable features must be available for -Z gitoxide"]) .masquerade_as_nightly_cargo(&["gitoxide=fetch"])
.run(); .run();
assert_eq!( assert_eq!(
@ -662,9 +644,7 @@ fn gitoxide_git_dependencies_switch_from_branch_to_rev() -> anyhow::Result<()> {
p.cargo("check") p.cargo("check")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-deps") .arg("-Zgit=shallow-deps")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
let db_clone = gix::open_opts( let db_clone = gix::open_opts(
@ -695,9 +675,7 @@ fn gitoxide_git_dependencies_switch_from_branch_to_rev() -> anyhow::Result<()> {
p.cargo("check") p.cargo("check")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-deps") .arg("-Zgit=shallow-deps")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
assert!( assert!(
@ -746,9 +724,7 @@ fn shallow_deps_work_with_revisions_and_branches_mixed_on_same_dependency() -> a
p.cargo("check") p.cargo("check")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-deps") .arg("-Zgit=shallow-deps")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
let db_paths = glob::glob(paths::home().join(".cargo/git/db/bar-*").to_str().unwrap())? let db_paths = glob::glob(paths::home().join(".cargo/git/db/bar-*").to_str().unwrap())?
@ -789,9 +765,7 @@ fn gitoxide_clones_registry_with_shallow_protocol_and_aborts_and_updates_again(
p.cargo("fetch") p.cargo("fetch")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-index") .arg("-Zgit=shallow-index")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
let repo = gix::open_opts(find_index(), gix::open::Options::isolated())?; let repo = gix::open_opts(find_index(), gix::open::Options::isolated())?;
@ -814,9 +788,7 @@ fn gitoxide_clones_registry_with_shallow_protocol_and_aborts_and_updates_again(
p.cargo("update") p.cargo("update")
.arg("-Zgitoxide=fetch") .arg("-Zgitoxide=fetch")
.arg("-Zgit=shallow-index") .arg("-Zgit=shallow-index")
.masquerade_as_nightly_cargo(&[ .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
"unstable features must be available for -Z gitoxide and -Z git",
])
.run(); .run();
assert!(!shallow_lock.is_file(), "the repository was re-initialized"); assert!(!shallow_lock.is_file(), "the repository was re-initialized");