Skip to content

Commit

Permalink
Auto merge of #6165 - Eh2406:cleanup, r=alexcrichton
Browse files Browse the repository at this point in the history 
small cleanups to registry tests

This should make the slow proptest tests approximately 10x faster. It also adds a test ensuring that we make fuzz inputs that involve multiple versions of the same library.
  • Loading branch information
@bors
bors committed Oct 11, 2018
2 parents 5dbac98 + c990908 commit 714f82a
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 58 deletions.
105 changes: 52 additions & 53 deletions tests/testsuite/resolve.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ proptest! {
})]
#[test]
fn passes_validation(
PrettyPrintRegistry(input) in registry_strategy(50, 10, 50)
PrettyPrintRegistry(input) in registry_strategy(50, 20, 60)
) {
let reg = registry(input.clone());
// there is only a small chance that eny one
Expand All @@ -51,7 +51,7 @@ proptest! {
}
#[test]
fn limited_independence_of_irrelevant_alternatives(
PrettyPrintRegistry(input) in registry_strategy(50, 10, 50),
PrettyPrintRegistry(input) in registry_strategy(50, 20, 60),
indexs_to_unpublish in vec(any::<prop::sample::Index>(), 10)
) {
let reg = registry(input.clone());
Expand All @@ -75,48 +75,13 @@ proptest! {
.filter(|x| !r.contains(x.package_id()))
.collect();
if !not_selected.is_empty() {
for index_to_unpublish in &indexs_to_unpublish {
let summary_to_unpublish = index_to_unpublish.get(&not_selected);
let new_reg = registry(
input
.iter()
.cloned()
.filter(|x| summary_to_unpublish != x)
.collect(),
);

let res = resolve(
&pkg_id("root"),
vec![dep_req(&this.name(), &format!("={}", this.version()))],
&new_reg,
);

// Note: that we can not assert that the two `res` are identical
// as the resolver does depend on irrelevant alternatives.
// It uses how constrained a dependency requirement is
// to determine what order to evaluate requirements.

prop_assert!(
res.is_ok(),
"unpublishing {:?} stopped `{} = \"={}\"` from working",
summary_to_unpublish.package_id(),
this.name(),
this.version()
)
}
}
}
let indexs_to_unpublish: Vec<_> = indexs_to_unpublish.iter().map(|x| x.get(&not_selected)).collect();

Err(_) => {
// If resolution was unsuccessful, then it should stay unsuccessful
// even if any version of a crate is unpublished.
for index_to_unpublish in &indexs_to_unpublish {
let summary_to_unpublish = index_to_unpublish.get(&input);
let new_reg = registry(
input
.iter()
.cloned()
.filter(|x| summary_to_unpublish != x)
.filter(|x| !indexs_to_unpublish.contains(&x))
.collect(),
);

Expand All @@ -126,15 +91,48 @@ proptest! {
&new_reg,
);

// Note: that we can not assert that the two `res` are identical
// as the resolver does depend on irrelevant alternatives.
// It uses how constrained a dependency requirement is
// to determine what order to evaluate requirements.

prop_assert!(
res.is_err(),
"full index did not work for `{} = \"={}\"` but unpublishing {:?} fixed it!",
res.is_ok(),
"unpublishing {:?} stopped `{} = \"={}\"` from working",
indexs_to_unpublish.iter().map(|x| x.package_id()).collect::<Vec<_>>(),
this.name(),
this.version(),
summary_to_unpublish.package_id()
this.version()
)
}
}

Err(_) => {
// If resolution was unsuccessful, then it should stay unsuccessful
// even if any version of a crate is unpublished.
let indexs_to_unpublish: Vec<_> = indexs_to_unpublish.iter().map(|x| x.get(&input)).collect();

let new_reg = registry(
input
.iter()
.cloned()
.filter(|x| !indexs_to_unpublish.contains(&x))
.collect(),
);

let res = resolve(
&pkg_id("root"),
vec![dep_req(&this.name(), &format!("={}", this.version()))],
&new_reg,
);

prop_assert!(
res.is_err(),
"full index did not work for `{} = \"={}\"` but unpublishing {:?} fixed it!",
this.name(),
this.version(),
indexs_to_unpublish.iter().map(|x| x.package_id()).collect::<Vec<_>>(),
)
}
}
}
}
Expand Down Expand Up @@ -180,15 +178,15 @@ fn test_resolving_transitive_deps() {
let reg = registry(vec![pkg!("foo"), pkg!("bar" => ["foo"])]);
let res = resolve(&pkg_id("root"), vec![dep("bar")], &reg).unwrap();

assert_contains(&res, &names(&["root", "foo", "bar"]));
assert_same(&res, &names(&["root", "foo", "bar"]));
}

#[test]
fn test_resolving_common_transitive_deps() {
let reg = registry(vec![pkg!("foo" => ["bar"]), pkg!("bar")]);
let res = resolve(&pkg_id("root"), vec![dep("foo"), dep("bar")], &reg).unwrap();

assert_contains(&res, &names(&["root", "foo", "bar"]));
assert_same(&res, &names(&["root", "foo", "bar"]));
}

#[test]
Expand Down Expand Up @@ -234,7 +232,7 @@ fn test_resolving_with_dev_deps() {
)
.unwrap();

assert_contains(&res, &names(&["root", "foo", "bar", "baz"]));
assert_same(&res, &names(&["root", "foo", "bar", "baz", "bat"]));
}

#[test]
Expand All @@ -243,7 +241,7 @@ fn resolving_with_many_versions() {

let res = resolve(&pkg_id("root"), vec![dep("foo")], &reg).unwrap();

assert_contains(&res, &names(&[("root", "1.0.0"), ("foo", "1.0.2")]));
assert_same(&res, &names(&[("root", "1.0.0"), ("foo", "1.0.2")]));
}

#[test]
Expand All @@ -252,7 +250,7 @@ fn resolving_with_specific_version() {

let res = resolve(&pkg_id("root"), vec![dep_req("foo", "=1.0.1")], &reg).unwrap();

assert_contains(&res, &names(&[("root", "1.0.0"), ("foo", "1.0.1")]));
assert_same(&res, &names(&[("root", "1.0.0"), ("foo", "1.0.1")]));
}

#[test]
Expand Down Expand Up @@ -459,7 +457,7 @@ fn resolving_allows_multiple_compatible_versions() {

let res = resolve(&pkg_id("root"), vec![dep("bar")], &reg).unwrap();

assert_contains(
assert_same(
&res,
&names(&[
("root", "1.0.0"),
Expand Down Expand Up @@ -492,7 +490,7 @@ fn resolving_with_deep_backtracking() {

let res = resolve(&pkg_id("root"), vec![dep_req("foo", "1")], &reg).unwrap();

assert_contains(
assert_same(
&res,
&names(&[
("root", "1.0.0"),
Expand Down Expand Up @@ -524,7 +522,7 @@ fn resolving_with_sys_crates() {
)
.unwrap();

assert_contains(
assert_same(
&res,
&names(&[
("root", "1.0.0"),
Expand Down Expand Up @@ -891,9 +889,10 @@ fn resolving_with_constrained_sibling_transitive_dep_effects() {

let res = resolve(&pkg_id("root"), vec![dep_req("A", "1")], &reg).unwrap();

assert_contains(
assert_same(
&res,
&names(&[
("root", "1.0.0"),
("A", "1.0.0"),
("B", "1.0.0"),
("C", "1.0.0"),
Expand Down Expand Up @@ -1109,7 +1108,7 @@ fn hard_equality() {
)
.unwrap();

assert_contains(
assert_same(
&res,
&names(&[("root", "1.0.0"), ("foo", "1.0.0"), ("bar", "1.0.0")]),
);
Expand Down
45 changes: 40 additions & 5 deletions tests/testsuite/support/resolver.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@ pub fn registry_strategy(
fn meta_test_deep_trees_from_strategy() {
let mut dis = [0; 21];

let strategy = registry_strategy(50, 10, 50);
for _ in 0..256 {
let strategy = registry_strategy(50, 20, 60);
for _ in 0..64 {
let PrettyPrintRegistry(input) = strategy
.new_tree(&mut TestRunner::default())
.unwrap()
Expand All @@ -445,9 +445,44 @@ fn meta_test_deep_trees_from_strategy() {
}
}

assert!(
dis.iter().all(|&x| x > 0),
"In 2560 tries we did not see a wide enough distribution of dependency trees! dis:{:?}",
panic!(
"In 640 tries we did not see a wide enough distribution of dependency trees! dis: {:?}",
dis
);
}

/// This test is to test the generator to ensure
/// that it makes registries that include multiple versions of the same library
#[test]
fn meta_test_multiple_versions_strategy() {
let mut dis = [0; 10];

let strategy = registry_strategy(50, 20, 60);
for _ in 0..64 {
let PrettyPrintRegistry(input) = strategy
.new_tree(&mut TestRunner::default())
.unwrap()
.current();
let reg = registry(input.clone());
for this in input.iter().rev().take(10) {
let mut res = resolve(
&pkg_id("root"),
vec![dep_req(&this.name(), &format!("={}", this.version()))],
&reg,
);
if let Ok(mut res) = res {
let res_len = res.len();
res.sort_by_key(|s| s.name());
res.dedup_by_key(|s| s.name());
dis[min(res_len - res.len(), dis.len() - 1)] += 1;
}
if dis.iter().all(|&x| x > 0) {
return;
}
}
}
panic!(
"In 640 tries we did not see a wide enough distribution of multiple versions of the same library! dis: {:?}",
dis
);
}
Expand Down

0 comments on commit 714f82a

Please sign in to comment.