Add tracker verification for test case uninstall_running_binary

Author: linyihai

src/cargo/ops/cargo_uninstall.rs

@@ -135,18 +135,18 @@ fn uninstall_pkgid(
         }
     }
 
-    let to_remove: Vec<&String> = {
+    let to_remove = {
         if bins.is_empty() {
-            installed.iter().collect()
+            installed
         } else {
-            bins.iter().collect()
+            bins
         }
     };
 
     for bin in to_remove {
-        let bin_path = dst.join(bin);
+        let bin_path = dst.join(&bin);
         config.shell().status("Removing", bin_path.display())?;
-        tracker.remove_bin_then_save(pkgid, bin, &bin_path)?;
+        tracker.remove_bin_then_save(pkgid, &bin, &bin_path)?;
     }
 
     Ok(())

src/cargo/ops/common_for_install_and_uninstall.rs

@@ -321,7 +321,7 @@ impl InstallTracker {
         self.v2.remove(pkg_id, bins);
     }
 
-    /// Remove a bin after it successfully had been removed in disk and the save the tracker at last.
+    /// Remove a bin after it successfully had been removed in disk and then save the tracker at last.
     pub fn remove_bin_then_save(
         &mut self,
         pkg_id: PackageId,

tests/testsuite/install.rs

@@ -3,6 +3,7 @@
 use std::fs::{self, OpenOptions};
 use std::io::prelude::*;
 use std::path::Path;
+use std::thread;
 
 use cargo_test_support::compare;
 use cargo_test_support::cross_compile;
@@ -11,10 +12,10 @@ use cargo_test_support::registry::{self, registry_path, Package};
 use cargo_test_support::{
     basic_manifest, cargo_process, no_such_file_err_msg, project, project_in, symlink_supported, t,
 };
-use cargo_util::ProcessError;
+use cargo_util::{ProcessBuilder, ProcessError};
 
 use cargo_test_support::install::{
-    assert_has_installed_exe, assert_has_not_installed_exe, cargo_home,
+    assert_has_installed_exe, assert_has_not_installed_exe, cargo_home, exe,
 };
 use cargo_test_support::paths::{self, CargoPathExt};
 use std::env;
@@ -2508,7 +2509,17 @@ fn install_incompat_msrv() {
         .with_status(101).run();
 }
 
-#[cfg(windows)]
+fn assert_tracker_noexistence(key: &str) {
+    let v1_data: toml::Value =
+        toml::from_str(&fs::read_to_string(cargo_home().join(".crates.toml")).unwrap()).unwrap();
+    let v2_data: serde_json::Value =
+        serde_json::from_str(&fs::read_to_string(cargo_home().join(".crates2.json")).unwrap())
+            .unwrap();
+
+    assert!(v1_data["v1"].get(key).is_none());
+    assert!(v2_data["installs"][key].is_null());
+}
+
 #[cargo_test]
 fn uninstall_running_binary() {
     Package::new("foo", "0.0.1")
@@ -2553,24 +2564,33 @@ fn uninstall_running_binary() {
         .run();
     assert_has_installed_exe(cargo_home(), "foo");
 
-    use cargo_util::ProcessBuilder;
-    use std::thread;
-    let foo_bin = cargo_test_support::install::cargo_home()
-        .join("bin")
-        .join(cargo_test_support::install::exe("foo"));
-
+    let foo_bin = cargo_home().join("bin").join(exe("foo"));
     let t = thread::spawn(|| ProcessBuilder::new(foo_bin).exec().unwrap());
+    let key = "foo 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)";
 
-    cargo_process("uninstall foo")
-        .with_status(101)
-        .with_stderr_contains("[ERROR] failed to remove file `[CWD]/home/.cargo/bin/foo[EXE]`")
-        .run();
-    assert_has_installed_exe(cargo_home(), "foo");
+    #[cfg(windows)]
+    {
+        cargo_process("uninstall foo")
+            .with_status(101)
+            .with_stderr_contains("[ERROR] failed to remove file `[CWD]/home/.cargo/bin/foo[EXE]`")
+            .run();
+        t.join().unwrap();
+        cargo_process("uninstall foo")
+            .with_stderr("[REMOVING] [CWD]/home/.cargo/bin/foo[EXE]")
+            .run();
+    };
+
+    #[cfg(not(windows))]
+    {
+        cargo_process("uninstall foo")
+            .with_stderr("[REMOVING] [CWD]/home/.cargo/bin/foo[EXE]")
+            .run();
+        t.join().unwrap();
+    };
+
+    assert_has_not_installed_exe(cargo_home(), "foo");
+    assert_tracker_noexistence(key);
 
-    t.join().unwrap();
-    cargo_process("uninstall foo")
-        .with_stderr("[REMOVING] [CWD]/home/.cargo/bin/foo[EXE]")
-        .run();
     cargo_process("install foo")
         .with_stderr(
             "\