Finish unit-testification of Windows update tests

One integration test kept as a smoke test for insurance.

Author: rbtcollins

src/cli/self_update/windows.rs

@@ -537,6 +537,57 @@ mod tests {
         });
     }
 
+    #[test]
+    fn windows_path_delete_key_when_empty() {
+        use std::io;
+        // during uninstall the PATH key may end up empty; if so we should
+        // delete it.
+        let tp = Box::new(currentprocess::TestProcess::default());
+        with_registry_edits(&|| {
+            currentprocess::with(tp.clone(), || {
+                let root = RegKey::predef(HKEY_CURRENT_USER);
+                let environment = root
+                    .open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
+                    .unwrap();
+                environment
+                    .set_raw_value(
+                        "PATH",
+                        &RegValue {
+                            bytes: utils::string_to_winreg_bytes("foo"),
+                            vtype: RegType::REG_EXPAND_SZ,
+                        },
+                    )
+                    .unwrap();
+
+                assert_eq!((), super::_apply_new_path(Some("".into())).unwrap());
+
+                let reg_value = environment.get_raw_value("PATH");
+                match reg_value {
+                    Ok(_) => panic!("key not deleted"),
+                    Err(ref e) if e.kind() == io::ErrorKind::NotFound => {}
+                    Err(ref e) => panic!("error {}", e),
+                }
+            })
+        });
+    }
+
+    #[test]
+    fn windows_treat_missing_path_as_empty() {
+        // during install the PATH key may be missing; treat it as empty
+        let tp = Box::new(currentprocess::TestProcess::default());
+        with_registry_edits(&|| {
+            currentprocess::with(tp.clone(), || {
+                let root = RegKey::predef(HKEY_CURRENT_USER);
+                let environment = root
+                    .open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
+                    .unwrap();
+                environment.delete_value("PATH").unwrap();
+
+                assert_eq!(Some("".into()), super::get_windows_path_var().unwrap());
+            })
+        });
+    }
+
     #[test]
     fn windows_uninstall_removes_semicolon_from_path_prefix() {
         assert_eq!(

tests/cli-self-upd.rs

@@ -494,32 +494,25 @@ fn when_cargo_home_is_the_default_write_path_specially() {
 
 #[test]
 #[cfg(windows)]
-fn install_adds_path() {
+/// Smoke test for end-to-end code connectivity of the installer path mgmt on windows.
+fn install_uninstall_affect_path() {
     setup(&|config| {
-        expect_ok(config, &["rustup-init", "-y"]);
-
         let path = config.cargodir.join("bin").to_string_lossy().to_string();
+
+        expect_ok(config, &["rustup-init", "-y"]);
         assert!(
             get_path().unwrap().contains(&path),
             format!("`{}` not in `{}`", get_path().unwrap(), &path)
         );
-    });
-}
 
-#[test]
-#[cfg(windows)]
-fn uninstall_removes_path() {
-    setup(&|config| {
-        expect_ok(config, &["rustup-init", "-y"]);
         expect_ok(config, &["rustup", "self", "uninstall", "-y"]);
-
-        let path = config.cargodir.join("bin").to_string_lossy().to_string();
         assert!(!get_path().unwrap().contains(&path));
     });
 }
 
 #[test]
 #[cfg(unix)]
+/// This covers both windows and unix no-path-modification cases due to the code structure.
 fn install_doesnt_modify_path_if_passed_no_modify_path() {
     setup(&|config| {
         let profile = config.homedir.join(".profile");
@@ -528,31 +521,6 @@ fn install_doesnt_modify_path_if_passed_no_modify_path() {
     });
 }
 
-#[test]
-#[cfg(windows)]
-fn install_doesnt_modify_path_if_passed_no_modify_path() {
-    use winreg::enums::{HKEY_CURRENT_USER, KEY_READ, KEY_WRITE};
-    use winreg::RegKey;
-
-    setup(&|config| {
-        let root = RegKey::predef(HKEY_CURRENT_USER);
-        let environment = root
-            .open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
-            .unwrap();
-        let old_path = environment.get_raw_value("PATH").unwrap();
-
-        expect_ok(config, &["rustup-init", "-y", "--no-modify-path"]);
-
-        let root = RegKey::predef(HKEY_CURRENT_USER);
-        let environment = root
-            .open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
-            .unwrap();
-        let new_path = environment.get_raw_value("PATH").unwrap();
-
-        assert_eq!(old_path, new_path);
-    });
-}
-
 #[test]
 fn update_exact() {
     let version = env!("CARGO_PKG_VERSION");
@@ -951,10 +919,6 @@ fn produces_env_file_on_unix() {
     });
 }
 
-#[test]
-#[cfg(windows)]
-fn doesnt_produce_env_file_on_windows() {}
-
 #[test]
 fn install_sets_up_stable() {
     setup(&|config| {
@@ -1015,42 +979,6 @@ fn rustup_init_works_with_weird_names() {
     });
 }
 
-// HKCU\Environment\PATH may not exist during install, and it may need to be
-// deleted during uninstall if we remove the last path from it
-#[test]
-#[cfg(windows)]
-fn windows_handle_empty_path_registry_key() {
-    use winreg::enums::{RegType, HKEY_CURRENT_USER, KEY_READ, KEY_WRITE};
-    use winreg::RegKey;
-
-    setup(&|config| {
-        let root = RegKey::predef(HKEY_CURRENT_USER);
-        let environment = root
-            .open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
-            .unwrap();
-        let _ = environment.delete_value("PATH");
-
-        expect_ok(config, &["rustup-init", "-y"]);
-
-        let root = RegKey::predef(HKEY_CURRENT_USER);
-        let environment = root
-            .open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
-            .unwrap();
-        let path = environment.get_raw_value("PATH").unwrap();
-        assert!(path.vtype == RegType::REG_EXPAND_SZ);
-
-        expect_ok(config, &["rustup", "self", "uninstall", "-y"]);
-
-        let root = RegKey::predef(HKEY_CURRENT_USER);
-        let environment = root
-            .open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
-            .unwrap();
-        let path = environment.get_raw_value("PATH");
-
-        assert!(path.is_err());
-    });
-}
-
 #[test]
 #[ignore] // untestable
 fn install_but_rustup_is_installed() {}