Make it clearer what each Scenario enables

Author: jonhoo

tests/mock/clitools.rs

@@ -445,44 +445,40 @@ enum RlsStatus {
 fn create_mock_dist_server(path: &Path, s: Scenario) {
     let mut chans = Vec::new();
 
-    let dates_count = match s {
-        Scenario::SimpleV1 | Scenario::SimpleV2 | Scenario::MultiHost => 1,
-        Scenario::Full
-        | Scenario::ArchivesV1
-        | Scenario::ArchivesV2
-        | Scenario::Unavailable
-        | Scenario::UnavailableRls => 2,
-        Scenario::MissingComponent => 3,
-    };
-
     if let Scenario::MissingComponent = s {
-        let c1 = build_mock_channel(
+        chans.push(build_mock_channel(
             s,
             "nightly",
             "2019-09-12",
             "1.37.0",
             "hash-n-1",
             RlsStatus::Available,
-        );
-        let c2 = build_mock_channel(
+        ));
+        chans.push(build_mock_channel(
             s,
             "nightly",
             "2019-09-13",
             "1.37.0",
             "hash-n-2",
             RlsStatus::Available,
-        );
-        let c3 = build_mock_channel(
+        ));
+        chans.push(build_mock_channel(
             s,
             "nightly",
             "2019-09-14",
             "1.37.0",
             "hash-n-3",
             RlsStatus::Unavailable,
-        );
-        chans.extend(vec![c1, c2, c3]);
-    } else if dates_count > 1 {
-        let c1 = build_mock_channel(
+        ));
+    }
+
+    if let Scenario::Full
+    | Scenario::ArchivesV1
+    | Scenario::ArchivesV2
+    | Scenario::Unavailable
+    | Scenario::UnavailableRls = s
+    {
+        chans.push(build_mock_channel(
             s,
             "nightly",
             "2015-01-01",
@@ -493,55 +489,60 @@ fn create_mock_dist_server(path: &Path, s: Scenario) {
             } else {
                 RlsStatus::Available
             },
-        );
-        let c2 = build_mock_channel(
+        ));
+        chans.push(build_mock_channel(
             s,
             "beta",
             "2015-01-01",
             "1.1.0",
             "hash-b-1",
             RlsStatus::Available,
-        );
-        let c3 = build_mock_channel(
+        ));
+        chans.push(build_mock_channel(
             s,
             "stable",
             "2015-01-01",
             "1.0.0",
             "hash-s-1",
             RlsStatus::Available,
-        );
-        chans.extend(vec![c1, c2, c3]);
+        ));
     }
+
     if s != Scenario::MissingComponent {
-        let c4 = if s == Scenario::Unavailable {
-            build_mock_unavailable_channel("nightly", "2015-01-02", "1.3.0", "hash-n-2")
+        if s == Scenario::Unavailable {
+            chans.push(build_mock_unavailable_channel(
+                "nightly",
+                "2015-01-02",
+                "1.3.0",
+                "hash-n-2",
+            ));
         } else {
-            build_mock_channel(
+            chans.push(build_mock_channel(
                 s,
                 "nightly",
                 "2015-01-02",
                 "1.3.0",
                 "hash-n-2",
                 RlsStatus::Renamed,
-            )
-        };
-        let c5 = build_mock_channel(
+            ));
+        }
+
+        chans.push(build_mock_channel(
             s,
             "beta",
             "2015-01-02",
             "1.2.0",
             "hash-b-2",
             RlsStatus::Available,
-        );
-        let c6 = build_mock_channel(
+        ));
+        chans.push(build_mock_channel(
             s,
             "stable",
             "2015-01-02",
             "1.1.0",
             "hash-s-2",
             RlsStatus::Available,
-        );
-        chans.extend(vec![c4, c5, c6]);
+        ));
     }
 
     let vs = match s {
@@ -561,18 +562,24 @@ fn create_mock_dist_server(path: &Path, s: Scenario) {
     }
     .write(&vs, true);
 
-    if s != Scenario::MissingComponent {
+    if let Scenario::Full
+    | Scenario::ArchivesV1
+    | Scenario::ArchivesV2
+    | Scenario::Unavailable
+    | Scenario::UnavailableRls = s
+    {
         // Also create the manifests for stable releases by version
-        if dates_count > 1 {
-            let _ = hard_link(
-                path.join("dist/2015-01-01/channel-rust-stable.toml"),
-                path.join("dist/channel-rust-1.0.0.toml"),
-            );
-            let _ = hard_link(
-                path.join("dist/2015-01-01/channel-rust-stable.toml.sha256"),
-                path.join("dist/channel-rust-1.0.0.toml.sha256"),
-            );
-        }
+        let _ = hard_link(
+            path.join("dist/2015-01-01/channel-rust-stable.toml"),
+            path.join("dist/channel-rust-1.0.0.toml"),
+        );
+        let _ = hard_link(
+            path.join("dist/2015-01-01/channel-rust-stable.toml.sha256"),
+            path.join("dist/channel-rust-1.0.0.toml.sha256"),
+        );
+    }
+
+    if s != Scenario::MissingComponent {
         let _ = hard_link(
             path.join("dist/2015-01-02/channel-rust-stable.toml"),
             path.join("dist/channel-rust-1.1.0.toml"),
@@ -581,27 +588,36 @@ fn create_mock_dist_server(path: &Path, s: Scenario) {
             path.join("dist/2015-01-02/channel-rust-stable.toml.sha256"),
             path.join("dist/channel-rust-1.1.0.toml.sha256"),
         );
+    }
 
-        // Same for v1 manifests. These are just the installers.
-        let host_triple = this_host_triple();
-        if dates_count > 1 {
-            hard_link(
-                path.join(format!(
-                    "dist/2015-01-01/rust-stable-{}.tar.gz",
-                    host_triple
-                )),
-                path.join(format!("dist/rust-1.0.0-{}.tar.gz", host_triple)),
-            )
-            .unwrap();
-            hard_link(
-                path.join(format!(
-                    "dist/2015-01-01/rust-stable-{}.tar.gz.sha256",
-                    host_triple
-                )),
-                path.join(format!("dist/rust-1.0.0-{}.tar.gz.sha256", host_triple)),
-            )
-            .unwrap();
-        }
+    // Same for v1 manifests. These are just the installers.
+    let host_triple = this_host_triple();
+
+    if let Scenario::Full
+    | Scenario::ArchivesV1
+    | Scenario::ArchivesV2
+    | Scenario::Unavailable
+    | Scenario::UnavailableRls = s
+    {
+        hard_link(
+            path.join(format!(
+                "dist/2015-01-01/rust-stable-{}.tar.gz",
+                host_triple
+            )),
+            path.join(format!("dist/rust-1.0.0-{}.tar.gz", host_triple)),
+        )
+        .unwrap();
+        hard_link(
+            path.join(format!(
+                "dist/2015-01-01/rust-stable-{}.tar.gz.sha256",
+                host_triple
+            )),
+            path.join(format!("dist/rust-1.0.0-{}.tar.gz.sha256", host_triple)),
+        )
+        .unwrap();
+    }
+
+    if s != Scenario::MissingComponent {
         hard_link(
             path.join(format!(
                 "dist/2015-01-02/rust-stable-{}.tar.gz",