Fix removed_component test

Author: nrc

src/dist/manifestation.rs

@@ -123,7 +123,7 @@ impl Manifestation {
         let update = Update::build_update(self, new_manifest, &changes, &config, notify_handler)?;
 
         if update.nothing_changes() {
-            // TODO chnages and ,manifest are empty?
+            // TODO changes and ,manifest are empty?
             eprintln!("update: {:?}", update);
             return Ok(UpdateStatus::Unchanged);
         }

tests/dist.rs

@@ -28,7 +28,7 @@ use tempdir::TempDir;
 // Creates a mock dist server populated with some test data
 pub fn create_mock_dist_server(
     path: &Path,
-    edit: Option<&dyn Fn(&str, &mut [MockPackage])>,
+    edit: Option<&dyn Fn(&str, &mut Vec<MockPackage>)>,
 ) -> MockDistServer {
     MockDistServer {
         path: path.to_owned(),
@@ -42,7 +42,7 @@ pub fn create_mock_dist_server(
 pub fn create_mock_channel(
     channel: &str,
     date: &str,
-    edit: Option<&dyn Fn(&str, &mut [MockPackage])>,
+    edit: Option<&dyn Fn(&str, &mut Vec<MockPackage>)>,
 ) -> MockChannel {
     // Put the date in the files so they can be differentiated
     let contents = Arc::new(date.as_bytes().to_vec());
@@ -303,7 +303,7 @@ fn rename_component() {
     let dist_tempdir = TempDir::new("rustup").unwrap();
     let ref url = Url::parse(&format!("file://{}", dist_tempdir.path().to_string_lossy())).unwrap();
 
-    let edit_1 = &|_: &str, pkgs: &mut [MockPackage]| {
+    let edit_1 = &|_: &str, pkgs: &mut Vec<MockPackage>| {
         let tpkg = pkgs[0]
             .targets
             .iter_mut()
@@ -314,7 +314,7 @@ fn rename_component() {
             target: "x86_64-apple-darwin".to_string(),
         });
     };
-    let edit_2 = &|_: &str, pkgs: &mut [MockPackage]| {
+    let edit_2 = &|_: &str, pkgs: &mut Vec<MockPackage>| {
         let tpkg = pkgs[0]
             .targets
             .iter_mut()
@@ -363,7 +363,7 @@ fn rename_component_new() {
     let dist_tempdir = TempDir::new("rustup").unwrap();
     let ref url = Url::parse(&format!("file://{}", dist_tempdir.path().to_string_lossy())).unwrap();
 
-    let edit_2 = &|_: &str, pkgs: &mut [MockPackage]| {
+    let edit_2 = &|_: &str, pkgs: &mut Vec<MockPackage>| {
         let tpkg = pkgs[0]
             .targets
             .iter_mut()
@@ -498,7 +498,7 @@ fn uninstall(
 }
 
 fn setup(
-    edit: Option<&dyn Fn(&str, &mut [MockPackage])>,
+    edit: Option<&dyn Fn(&str, &mut Vec<MockPackage>)>,
     enable_xz: bool,
     f: &dyn Fn(&Url, &ToolchainDesc, &InstallPrefix, &DownloadCfg<'_>, &temp::Cfg),
 ) {
@@ -623,7 +623,7 @@ fn upgrade() {
 #[test]
 fn unavailable_component() {
     // On day 2 the bonus component is no longer available
-    let edit = &|date: &str, pkgs: &mut [MockPackage]| {
+    let edit = &|date: &str, pkgs: &mut Vec<MockPackage>| {
         // Require the bonus component every dat
         {
             let tpkg = pkgs[0]
@@ -671,7 +671,7 @@ fn unavailable_component() {
 #[test]
 fn removed_component() {
     // On day 1 install the 'bonus' component, on day 2 its no longer a component
-    let edit = &|date: &str, pkgs: &mut [MockPackage]| {
+    let edit = &|date: &str, pkgs: &mut Vec<MockPackage>| {
         if date == "2016-02-01" {
             let tpkg = pkgs[0]
                 .targets
@@ -682,37 +682,28 @@ fn removed_component() {
                 name: "bonus".to_string(),
                 target: "x86_64-apple-darwin".to_string(),
             });
+        } else {
+            pkgs.retain(|p| p.name != "bonus");
         }
     };
 
     setup(
         Some(edit),
         false,
         &|url, toolchain, prefix, download_cfg, temp_cfg| {
-            let received_notification = Arc::new(Cell::new(false));
-
-            let download_cfg = DownloadCfg {
-                dist_root: download_cfg.dist_root,
-                temp_cfg: download_cfg.temp_cfg,
-                download_dir: download_cfg.download_dir,
-                notify_handler: &|n| {
-                    if let Notification::ComponentUnavailable("bonus", Some(_)) = n {
-                        received_notification.set(true);
-                    }
-                },
-            };
+            let adds = [Component::new(
+                "bonus".to_string(),
+                Some(TargetTriple::from_str("x86_64-apple-darwin")),
+            )];
 
-            change_channel_date(url, "nightly", "2016-02-01");
             // Update with bonus.
-            update_from_dist(url, toolchain, prefix, &[], &[], &download_cfg, temp_cfg).unwrap();
+            change_channel_date(url, "nightly", "2016-02-01");
+            update_from_dist(url, toolchain, prefix, &adds, &[], &download_cfg, temp_cfg).unwrap();
             assert!(utils::path_exists(&prefix.path().join("bin/bonus")));
-            change_channel_date(url, "nightly", "2016-02-02");
 
             // Update without bonus, should emit a notify and remove the bonus component
-            update_from_dist(url, toolchain, prefix, &[], &[], &download_cfg, temp_cfg).unwrap();
-            assert!(!utils::path_exists(&prefix.path().join("bin/bonus")));
-
-            assert!(received_notification.get());
+            change_channel_date(url, "nightly", "2016-02-02");
+            assert!(update_from_dist(url, toolchain, prefix, &[], &[], &download_cfg, temp_cfg).is_err());
         },
     );
 }
@@ -759,7 +750,7 @@ fn update_preserves_extensions() {
 
 #[test]
 fn update_preserves_extensions_that_became_components() {
-    let edit = &|date: &str, pkgs: &mut [MockPackage]| {
+    let edit = &|date: &str, pkgs: &mut Vec<MockPackage>| {
         if date == "2016-02-01" {
             let tpkg = pkgs[0]
                 .targets
@@ -806,7 +797,7 @@ fn update_preserves_extensions_that_became_components() {
 
 #[test]
 fn update_preserves_components_that_became_extensions() {
-    let edit = &|date: &str, pkgs: &mut [MockPackage]| {
+    let edit = &|date: &str, pkgs: &mut Vec<MockPackage>| {
         if date == "2016-02-01" {
             let tpkg = pkgs[0]
                 .targets
@@ -1139,7 +1130,7 @@ fn remove_extension_not_in_manifest() {
 #[test]
 #[should_panic]
 fn remove_extension_not_in_manifest_but_is_already_installed() {
-    let edit = &|date: &str, pkgs: &mut [MockPackage]| {
+    let edit = &|date: &str, pkgs: &mut Vec<MockPackage>| {
         if date == "2016-02-01" {
             let tpkg = pkgs[0]
                 .targets