Update tests

Author: pietroalbini

src/rustup-dist/tests/dist.rs

@@ -645,10 +645,11 @@ fn upgrade() {
 }
 
 #[test]
-fn force_update() {
-    // On day 1 install the 'bonus' component, on day 2 its no longer a component
+fn unavailable_component() {
+    // On day 2 the bonus component is no longer available
     let edit = &|date: &str, pkgs: &mut [MockPackage]| {
-        if date == "2016-02-01" {
+        // Require the bonus component every dat
+        {
             let tpkg = pkgs[0].targets
                 .iter_mut()
                 .find(|p| p.target == "x86_64-apple-darwin")
@@ -658,6 +659,17 @@ fn force_update() {
                 target: "x86_64-apple-darwin".to_string(),
             });
         }
+
+        // Mark the bonus package as unavailable in 2016-02-02
+        if date == "2016-02-02" {
+            let bonus_pkg = pkgs.iter_mut()
+                .find(|p| p.name == "bonus")
+                .unwrap();
+
+            for target in &mut bonus_pkg.targets {
+                target.available = false;
+            }
+        }
     };
 
     setup(
@@ -677,18 +689,54 @@ fn force_update() {
                 ErrorKind::RequestedComponentsUnavailable(..) => {}
                 _ => panic!(),
             }
-            // Force update without bonus, should succeed, but bonus binary will be missing.
-            update_from_dist_(
-                url,
-                toolchain,
-                prefix,
-                &[],
-                &[],
-                download_cfg,
-                temp_cfg,
-                true,
-            ).unwrap();
+        },
+    );
+}
+
+#[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]| {
+        if date == "2016-02-01" {
+            let tpkg = pkgs[0].targets
+                .iter_mut()
+                .find(|p| p.target == "x86_64-apple-darwin")
+                .unwrap();
+            tpkg.components.push(MockComponent {
+                name: "bonus".to_string(),
+                target: "x86_64-apple-darwin".to_string(),
+            });
+        }
+    };
+
+    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);
+                    }
+                },
+            };
+
+            change_channel_date(url, "nightly", "2016-02-01");
+            // Update with bonus.
+            update_from_dist(url, toolchain, prefix, &[], &[], &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());
         },
     );
 }