(wip) add tests

Author: rami3l

src/test/clitools.rs

@@ -473,6 +473,8 @@ pub enum Scenario {
     /// Three dates, v2 manifests, host and MULTI_ARCH1 in first, host only in second,
     /// host and MULTI_ARCH1 but no RLS in last
     MissingComponentMulti,
+    /// One date, v2 manifests, with rust-analyzer
+    RustAnalyzer,
 }
 
 impl Scenario {
@@ -561,6 +563,9 @@ impl Scenario {
                     .multi_arch()
                     .with_rls(RlsStatus::Unavailable),
             ],
+            Self::RustAnalyzer => {
+                vec![Release::stable("1.79.0", "2024-06-15").with_rls(RlsStatus::RustAnalyzer)]
+            }
         };
 
         let vs = match self {
@@ -581,7 +586,8 @@ impl Scenario {
             | Self::HostGoesMissingBefore
             | Self::HostGoesMissingAfter
             | Self::MissingComponent
-            | Self::MissingComponentMulti => vec![MockManifestVersion::V2],
+            | Self::MissingComponentMulti
+            | Self::RustAnalyzer => vec![MockManifestVersion::V2],
         };
 
         MockDistServer {
@@ -634,6 +640,7 @@ impl ConstState {
                 Scenario::MultiHost => RwLock::new(None),
                 Scenario::None => RwLock::new(None),
                 Scenario::RemovedRls => RwLock::new(None),
+                Scenario::RustAnalyzer => RwLock::new(None),
                 Scenario::SimpleV1 => RwLock::new(None),
                 Scenario::SimpleV2 => RwLock::new(None),
                 Scenario::Unavailable => RwLock::new(None),
@@ -748,6 +755,7 @@ async fn setup_test_state(test_dist_dir: tempfile::TempDir) -> (tempfile::TempDi
     let rustc_path = config.exedir.join(format!("rustc{EXE_SUFFIX}"));
     let cargo_path = config.exedir.join(format!("cargo{EXE_SUFFIX}"));
     let rls_path = config.exedir.join(format!("rls{EXE_SUFFIX}"));
+    let rust_analyzer_path = config.exedir.join(format!("rust-analyzer{EXE_SUFFIX}"));
     let rust_lldb_path = config.exedir.join(format!("rust-lldb{EXE_SUFFIX}"));
 
     const ESTIMATED_LINKS_PER_TEST: usize = 6 * 2;
@@ -784,6 +792,7 @@ async fn setup_test_state(test_dist_dir: tempfile::TempDir) -> (tempfile::TempDi
     hard_link(&rustup_path, rustc_path).unwrap();
     hard_link(&rustup_path, cargo_path).unwrap();
     hard_link(&rustup_path, rls_path).unwrap();
+    hard_link(&rustup_path, rust_analyzer_path).unwrap();
     hard_link(&rustup_path, rust_lldb_path).unwrap();
 
     // Make sure the host triple matches the build triple. Otherwise testing a 32-bit build of

src/test/dist.rs

@@ -365,6 +365,12 @@ impl MockChannel {
                         target: target.to_string(),
                         is_extension: true,
                     });
+                } else if rls == RlsStatus::RustAnalyzer {
+                    target_pkg.components.push(MockComponent {
+                        name: "rust-analyzer".to_string(),
+                        target: target.to_string(),
+                        is_extension: true,
+                    });
                 } else {
                     target_pkg.components.push(MockComponent {
                         name: "rls".to_string(),
@@ -482,13 +488,15 @@ impl MockChannelContent {
 pub(super) enum RlsStatus {
     Available,
     Renamed,
+    RustAnalyzer,
     Unavailable,
 }
 
 impl RlsStatus {
     fn pkg_name(self) -> &'static str {
         match self {
             Self::Renamed => "rls-preview",
+            Self::RustAnalyzer => "rust-analyzer",
             _ => "rls",
         }
     }

src/test/mock.rs

@@ -67,10 +67,14 @@ impl MockInstallerBuilder {
     }
 
     pub(super) fn rls(version: &str, version_hash: &str, pkg_name: &str) -> Self {
+        let bin = match pkg_name {
+            "rust-analyzer" => pkg_name,
+            _ => "rls",
+        };
         Self {
             components: vec![MockComponentBuilder {
                 name: pkg_name.to_string(),
-                files: mock_bin("rls", version, version_hash),
+                files: mock_bin(bin, version, version_hash),
             }],
         }
     }

src/test/mock_bin_src.rs

@@ -102,6 +102,10 @@ fn main() {
                 panic!("CARGO environment variable not set");
             }
         }
+        Some("--echo-current-exe") => {
+            let mut out = io::stderr();
+            writeln!(out, "{}", std::env::current_exe().unwrap().display()).unwrap();
+        }
         arg => panic!("bad mock proxy commandline: {:?}", arg),
     }
 }

tests/suite/cli_misc.rs

@@ -1277,3 +1277,40 @@ async fn rustup_updates_cargo_env_if_proxy() {
         )
         .await;
 }
+
+#[tokio::test]
+async fn rust_analyzer_proxy_falls_back_external() {
+    let mut cx = CliTestContext::new(Scenario::RustAnalyzer).await;
+    cx.config.expect_ok(&["rustup", "default", "stable"]).await;
+    cx.config
+        .expect_ok(&["rustup", "component", "add", "rust-analyzer"])
+        .await;
+
+    let real_path = cx
+        .config
+        .run("rustup", &["which", "rust-analyzer"], &[])
+        .await;
+    assert!(real_path.ok);
+    let real_path_str = &real_path.stdout;
+    let real_path = Path::new(&real_path_str);
+
+    cx.config
+        .expect_ok_ex(&["rust-analyzer", "--echo-current-exe"], "", &real_path_str)
+        .await;
+
+    let tempdir = tempfile::Builder::new().prefix("rustup").tempdir().unwrap();
+    let extern_path = tempdir.path().join("rust-analyzer");
+    fs::copy(real_path, &extern_path).unwrap();
+
+    cx.config
+        .expect_ok(&["rustup", "component", "remove", "rust-analyzer"])
+        .await;
+    cx.config
+        .expect_ok_ex_env(
+            &["rust-analyzer", "--echo-current-exe"],
+            &[("PATH", &tempdir.path().to_string_lossy())],
+            "",
+            &extern_path.to_string_lossy(),
+        )
+        .await;
+}