feat(test): isolate Windows registry state per test

Author: baka-gourd

src/cli/self_update.rs

@@ -91,8 +91,10 @@ pub(crate) use unix::{run_update, self_replace};
 mod windows;
 #[cfg(windows)]
 pub use windows::complete_windows_uninstall;
+#[cfg(all(windows, any(test, feature = "test")))]
+pub(crate) use windows::test_id;
 #[cfg(all(windows, feature = "test"))]
-pub use windows::{RegistryGuard, RegistryValueId, USER_PATH, get_path};
+pub use windows::{RUSTUP_TEST_REGISTRY_UUID, RegistryValueId, USER_PATH, get_path};
 #[cfg(windows)]
 use windows::{do_add_to_path, do_add_to_programs, do_remove_from_path, do_remove_from_programs};
 #[cfg(windows)]
@@ -505,7 +507,7 @@ impl SelfUpdateMode {
         let setup_path = prepare_update(dl_cfg).await?;
 
         if let Some(setup_path) = &setup_path {
-            return run_update(setup_path);
+            return run_update(setup_path, dl_cfg.process);
         } else {
             // Try again in case we emitted "tool `{}` is already installed" last time.
             install_proxies(dl_cfg.process)?;
@@ -1019,7 +1021,7 @@ fn clean_cargo_home(no_modify_path: bool, process: &Process) -> Result<()> {
     utils::remove_file("rustup_bin", &rustup_path)?;
 
     #[cfg(windows)]
-    do_remove_from_programs()?;
+    do_remove_from_programs(process)?;
 
     let cargo_bin_display = cargo_bin.display();
     info!("removing empty cargo bin directory `{cargo_bin_display}`");
@@ -1146,7 +1148,7 @@ pub(crate) async fn update(cfg: &Cfg<'_>) -> Result<ExitCode> {
                 PackageUpdate::Rustup,
                 Ok(UpdateStatus::Updated(version)),
             );
-            return run_update(&setup_path);
+            return run_update(&setup_path, cfg.process);
         }
         None => {
             let _ = common::show_channel_update(

src/cli/self_update/unix.rs

@@ -117,7 +117,7 @@ pub(crate) fn do_write_env_files(process: &Process) -> Result<()> {
 
 /// Tell the upgrader to replace the rustup bins, then delete
 /// itself.
-pub(crate) fn run_update(setup_path: &Path) -> Result<utils::ExitCode> {
+pub(crate) fn run_update(setup_path: &Path, _process: &Process) -> Result<utils::ExitCode> {
     let status = Command::new(setup_path)
         .arg("--self-replace")
         .status()