tests: update package feature unification tests to use correct unificatin

Author: mladedav

tests/testsuite/feature_unification.rs

@@ -131,7 +131,7 @@ fn package_feature_unification() {
             ".cargo/config.toml",
             r#"
                 [resolver]
-                feature-unification = "selected"
+                feature-unification = "package"
             "#,
         )
         .file(
@@ -240,14 +240,21 @@ fn package_feature_unification() {
     p.cargo("check -p a -p b")
         .arg("-Zfeature-unification")
         .masquerade_as_nightly_cargo(&["feature-unification"])
-        .with_status(101)
-        .with_stderr_contains("[ERROR] features were unified")
+        .with_stderr_data(
+            str![[r#"
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+
+"#]]
+            .unordered(),
+        )
         .run();
     p.cargo("check")
         .arg("-Zfeature-unification")
         .masquerade_as_nightly_cargo(&["feature-unification"])
-        .with_status(101)
-        .with_stderr_contains("[ERROR] features were unified")
+        .with_stderr_data(str![[r#"
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+
+"#]])
         .run();
     // Sanity check that compilation without package feature unification does not work
     p.cargo("check -p a -p b")
@@ -266,7 +273,7 @@ fn package_feature_unification_default_features() {
             ".cargo/config.toml",
             r#"
                 [resolver]
-                feature-unification = "selected"
+                feature-unification = "package"
             "#,
         )
         .file(
@@ -361,8 +368,13 @@ fn package_feature_unification_default_features() {
     p.cargo("check")
         .arg("-Zfeature-unification")
         .masquerade_as_nightly_cargo(&["feature-unification"])
-        .with_status(101)
-        .with_stderr_contains("[ERROR] features were unified")
+        .with_stderr_data(
+            str![[r#"
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+
+"#]]
+            .unordered(),
+        )
         .run();
 }
 
@@ -442,6 +454,30 @@ fn package_feature_unification_weak_dependencies() {
         .file("b/src/lib.rs", "pub use common::b;")
         .build();
 
+    p.cargo("check -p a -p b")
+        .arg("-Zfeature-unification")
+        .masquerade_as_nightly_cargo(&["feature-unification"])
+        .with_stderr_data(
+            str![[r#"
+[CHECKING] common v0.1.0 ([ROOT]/foo/common)
+[CHECKING] a v0.1.0 ([ROOT]/foo/a)
+[CHECKING] b v0.1.0 ([ROOT]/foo/b)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+
+"#]]
+            .unordered(),
+        )
+        .run();
+    p.cargo("check")
+        .arg("-Zfeature-unification")
+        .masquerade_as_nightly_cargo(&["feature-unification"])
+        .with_stderr_data(str![[r#"
+[CHECKING] common v0.1.0 ([ROOT]/foo/common)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+
+"#]])
+        .run();
+
     // Sanity check that compilation without package feature unification does not work
     p.cargo("check -p a -p b")
         .arg("-Zfeature-unification")
@@ -586,6 +622,34 @@ b v0.1.0 ([ROOT]/foo/b)
 
 common v0.1.0 ([ROOT]/foo/common)
 
+"#]])
+        .run();
+
+    p.cargo("tree -e features")
+        .arg("-Zfeature-unification")
+        .masquerade_as_nightly_cargo(&["feature-unification"])
+        .env("CARGO_RESOLVER_FEATURE_UNIFICATION", "package")
+        .with_stdout_data(str![[r#"
+common v0.1.0 ([ROOT]/foo/common)
+a v0.1.0 ([ROOT]/foo/a)
+├── common feature "a"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── common feature "default"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── outside feature "a"
+│   └── outside v0.1.0
+└── outside feature "default"
+    └── outside v0.1.0
+b v0.1.0 ([ROOT]/foo/b)
+├── common feature "b"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── common feature "default"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── outside feature "b"
+│   └── outside v0.1.0
+└── outside feature "default"
+    └── outside v0.1.0
+
 "#]])
         .run();
 }
@@ -658,6 +722,20 @@ fn cargo_install_ignores_config() {
 [INSTALLED] package `a v0.1.0 ([ROOT]/foo)` (executable `a[EXE]`)
 [WARNING] be sure to add `[ROOT]/home/.cargo/bin` to your PATH to be able to run the installed binaries
 
+"#]])
+        .run();
+    cargo_process("install --path")
+        .arg(p.root())
+        .arg("-Zfeature-unification")
+        .masquerade_as_nightly_cargo(&["feature-unification"])
+        .env("CARGO_RESOLVER_FEATURE_UNIFICATION", "package")
+        .with_stderr_data(str![[r#"
+[INSTALLING] a v0.1.0 ([ROOT]/foo)
+[FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s
+[REPLACING] [ROOT]/home/.cargo/bin/a
+[REPLACED] package `a v0.1.0 ([ROOT]/foo)` with `a v0.1.0 ([ROOT]/foo)` (executable `a`)
+[WARNING] be sure to add `[ROOT]/home/.cargo/bin` to your PATH to be able to run the installed binaries
+
 "#]])
         .run();
 }
@@ -706,6 +784,7 @@ edition = "2021"
         .build();
 
     p.cargo("fix --edition --allow-no-vcs")
+        .env("CARGO_RESOLVER_FEATURE_UNIFICATION", "package")
         .arg("-Zfeature-unification")
         .masquerade_as_nightly_cargo(&["feature-unification"])
         .with_stderr_data(str![[r#"