fix(test/clitools): reset RUST_RECURSION_COUNT at test startup

This commit also ensures that every test case relying on the
`RUSTUP_AUTO_INSTALL` config option is explicitly setting it.

Author: rami3l

src/test/clitools.rs

@@ -277,6 +277,9 @@ impl Config {
             "/bogus-config-file.toml",
         );
 
+        // Clear current recursion count to avoid messing up related logic
+        cmd.env("RUST_RECURSION_COUNT", "");
+
         // Pass `RUSTUP_CI` over to the test process in case it is required downstream
         if let Some(ci) = env::var_os("RUSTUP_CI") {
             cmd.env("RUSTUP_CI", ci);

tests/suite/cli_misc.rs

@@ -64,7 +64,7 @@ async fn rustc_with_bad_rustup_toolchain_env_var() {
         .expect_with_env(["rustc"], [("RUSTUP_TOOLCHAIN", "bogus")])
         .await
         .with_stderr(snapbox::str![[r#"
-error: override toolchain 'bogus' is not installed[..]
+error:[..] toolchain 'bogus' is not installed[..]
 
 "#]])
         .is_err();
@@ -1381,7 +1381,10 @@ async fn which_asking_uninstalled_toolchain() {
 "#]])
         .is_ok();
     cx.config
-        .expect(["rustup", "which", "--toolchain=nightly", "rustc"])
+        .expect_with_env(
+            ["rustup", "which", "--toolchain=nightly", "rustc"],
+            [("RUSTUP_AUTO_INSTALL", "1")],
+        )
         .await
         .with_stdout(snapbox::str![[r#"
 [..]/toolchains/nightly-[HOST_TRIPLE]/bin/rustc[EXE]
@@ -1512,7 +1515,7 @@ active because: overridden by +toolchain on the command line
         .expect(["rustup", "+foo", "which", "rustc"])
         .await
         .with_stderr(snapbox::str![[r#"
-error: override toolchain 'foo' is not installed: the +toolchain on the command line specifies an uninstalled toolchain
+error:[..] toolchain 'foo' is not installed[..]
 
 "#]])
         .is_err();
@@ -1753,11 +1756,7 @@ async fn warn_auto_install() {
     cx.config
         .expect_with_env(
             ["rustc", "--version"],
-            [
-                ("RUSTUP_TOOLCHAIN", "stable"),
-                ("RUSTUP_AUTO_INSTALL", "1"),
-                ("RUST_RECURSION_COUNT", ""),
-            ],
+            [("RUSTUP_TOOLCHAIN", "stable"), ("RUSTUP_AUTO_INSTALL", "1")],
         )
         .await
         .with_stdout(snapbox::str![[r#"

tests/suite/cli_rustup.rs

@@ -1238,7 +1238,7 @@ async fn show_toolchain_override_not_installed() {
         .await
         .is_ok();
     cx.config
-        .expect(["rustup", "show"])
+        .expect_with_env(["rustup", "show"], [("RUSTUP_AUTO_INSTALL", "1")])
         .await
         .extend_redactions([("[RUSTUP_DIR]", &cx.config.rustupdir.to_string())])
         .with_stdout(snapbox::str![[r#"
@@ -1353,7 +1353,13 @@ installed targets:
 async fn show_toolchain_env_not_installed() {
     let cx = CliTestContext::new(Scenario::SimpleV2).await;
     cx.config
-        .expect_with_env(["rustup", "show"], [("RUSTUP_TOOLCHAIN", "nightly")])
+        .expect_with_env(
+            ["rustup", "show"],
+            [
+                ("RUSTUP_TOOLCHAIN", "nightly"),
+                ("RUSTUP_AUTO_INSTALL", "1"),
+            ],
+        )
         .await
         .extend_redactions([("[RUSTUP_DIR]", &cx.config.rustupdir.to_string())])
         .is_ok()

tests/suite/cli_v1.rs

@@ -271,13 +271,14 @@ async fn remove_override_toolchain_err_handling() {
         .await
         .is_ok();
     cx.config
-        .expect(["rustc", "--version"])
+        .expect_with_env(["rustc", "--version"], [("RUSTUP_AUTO_INSTALL", "1")])
         .await
         .with_stdout(snapbox::str![[r#"
 1.2.0 (hash-beta-1.2.0)
 
 "#]])
         .with_stderr(snapbox::str![[r#"
+...
 info: syncing channel updates for 'beta-[HOST_TRIPLE]'
 ...
 "#]])

tests/suite/cli_v2.rs

@@ -478,13 +478,14 @@ async fn remove_override_toolchain_err_handling() {
         .await
         .is_ok();
     cx.config
-        .expect(["rustc", "--version"])
+        .expect_with_env(["rustc", "--version"], [("RUSTUP_AUTO_INSTALL", "1")])
         .await
         .with_stdout(snapbox::str![[r#"
 1.2.0 (hash-beta-1.2.0)
 
 "#]])
         .with_stderr(snapbox::str![[r#"
+...
 info: syncing channel updates for 'beta-[HOST_TRIPLE]'
 info: latest update on 2015-01-02, rust version 1.2.0 (hash-beta-1.2.0)
 info: downloading component[..]
@@ -511,13 +512,14 @@ async fn file_override_toolchain_err_handling() {
     let toolchain_file = cwd.join("rust-toolchain");
     rustup::utils::raw::write_file(&toolchain_file, "beta").unwrap();
     cx.config
-        .expect(["rustc", "--version"])
+        .expect_with_env(["rustc", "--version"], [("RUSTUP_AUTO_INSTALL", "1")])
         .await
         .with_stdout(snapbox::str![[r#"
 1.2.0 (hash-beta-1.2.0)
 
 "#]])
         .with_stderr(snapbox::str![[r#"
+...
 info: syncing channel updates for 'beta-[HOST_TRIPLE]'
 info: latest update on 2015-01-02, rust version 1.2.0 (hash-beta-1.2.0)
 info: downloading component[..]
@@ -553,7 +555,10 @@ error: toolchain 'beta-[HOST_TRIPLE]' is not installed
 "#]])
         .is_err();
     cx.config
-        .expect(["rustc", "+beta", "--version"])
+        .expect_with_env(
+            ["rustc", "+beta", "--version"],
+            [("RUSTUP_AUTO_INSTALL", "1")],
+        )
         .await
         .with_stdout(snapbox::str![[r#"
 1.2.0 (hash-beta-1.2.0)