Skip to content

Commit bf3ca3c

Browse files
committed
test: replace glob with explicit unordered calls
1 parent c7cb45c commit bf3ca3c

File tree

1 file changed

+31
-18
lines changed

1 file changed

+31
-18
lines changed

tests/testsuite/features.rs

+31-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//! Tests for `[features]` table.
22
33
use cargo_test_support::paths::CargoPathExt;
4+
use cargo_test_support::prelude::*;
45
use cargo_test_support::registry::{Dependency, Package};
56
use cargo_test_support::str;
67
use cargo_test_support::{basic_manifest, project};
@@ -740,14 +741,17 @@ fn groups_on_groups_on_groups() {
740741
.build();
741742

742743
p.cargo("check")
743-
.with_stderr_data(str![[r#"
744+
.with_stderr_data(
745+
str![[r#"
744746
[LOCKING] 3 packages to latest compatible versions
745-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
746-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
747+
[CHECKING] bar v0.0.1 ([ROOT]/foo/bar)
748+
[CHECKING] baz v0.0.1 ([ROOT]/foo/baz)
747749
[CHECKING] foo v0.0.1 ([ROOT]/foo)
748750
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
749751
750-
"#]])
752+
"#]]
753+
.unordered(),
754+
)
751755
.run();
752756
}
753757

@@ -790,14 +794,17 @@ fn many_cli_features() {
790794

791795
p.cargo("check --features")
792796
.arg("bar baz")
793-
.with_stderr_data(str![[r#"
797+
.with_stderr_data(
798+
str![[r#"
794799
[LOCKING] 3 packages to latest compatible versions
795-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
796-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
800+
[CHECKING] bar v0.0.1 ([ROOT]/foo/bar)
801+
[CHECKING] baz v0.0.1 ([ROOT]/foo/baz)
797802
[CHECKING] foo v0.0.1 ([ROOT]/foo)
798803
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
799804
800-
"#]])
805+
"#]]
806+
.unordered(),
807+
)
801808
.run();
802809
}
803810

@@ -1512,14 +1519,17 @@ fn many_cli_features_comma_delimited() {
15121519
.build();
15131520

15141521
p.cargo("check --features bar,baz")
1515-
.with_stderr_data(str![[r#"
1522+
.with_stderr_data(
1523+
str![[r#"
15161524
[LOCKING] 3 packages to latest compatible versions
1517-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
1518-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
1525+
[CHECKING] bar v0.0.1 ([ROOT]/foo/bar)
1526+
[CHECKING] baz v0.0.1 ([ROOT]/foo/baz)
15191527
[CHECKING] foo v0.0.1 ([ROOT]/foo)
15201528
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
15211529
1522-
"#]])
1530+
"#]]
1531+
.unordered(),
1532+
)
15231533
.run();
15241534
}
15251535

@@ -1578,16 +1588,19 @@ fn many_cli_features_comma_and_space_delimited() {
15781588

15791589
p.cargo("check --features")
15801590
.arg("bar,baz bam bap")
1581-
.with_stderr_data(str![[r#"
1591+
.with_stderr_data(
1592+
str![[r#"
15821593
[LOCKING] 5 packages to latest compatible versions
1583-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
1584-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
1585-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
1586-
[CHECKING] ba[..] v0.0.1 ([ROOT]/foo/ba[..])
1594+
[CHECKING] bam v0.0.1 ([ROOT]/foo/bam)
1595+
[CHECKING] bap v0.0.1 ([ROOT]/foo/bap)
1596+
[CHECKING] bar v0.0.1 ([ROOT]/foo/bar)
1597+
[CHECKING] baz v0.0.1 ([ROOT]/foo/baz)
15871598
[CHECKING] foo v0.0.1 ([ROOT]/foo)
15881599
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
15891600
1590-
"#]])
1601+
"#]]
1602+
.unordered(),
1603+
)
15911604
.run();
15921605
}
15931606

0 commit comments

Comments
 (0)