tests: move DistContext into library

Author: djc

src/test.rs

@@ -32,6 +32,7 @@ pub use clitools::{
     output_release_file, print_command, print_indented,
 };
 pub(crate) mod dist;
+pub use dist::DistContext;
 pub(crate) mod mock;
 pub use mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};
 

src/test/dist.rs

@@ -9,17 +9,67 @@ use std::sync::{LazyLock, Mutex};
 
 use url::Url;
 
+use super::clitools::hard_link;
+use super::mock::MockInstallerBuilder;
+use super::{CROSS_ARCH1, CROSS_ARCH2, MULTI_ARCH1, create_hash, this_host_triple};
 use crate::dist::{
-    Profile, TargetTriple,
+    DEFAULT_DIST_SERVER, Profile, TargetTriple,
+    component::{Components, DirectoryPackage, Transaction},
     manifest::{
         Component, CompressionKind, HashedBinary, Manifest, ManifestVersion, Package,
         PackageTargets, Renamed, TargetedPackage,
     },
+    prefix::InstallPrefix,
+    temp,
 };
+use crate::notifications::Notification;
+use crate::process::TestProcess;
+
+pub struct DistContext {
+    pkg_dir: tempfile::TempDir,
+    pub inst_dir: tempfile::TempDir,
+    pub prefix: InstallPrefix,
+    _tmp_dir: tempfile::TempDir,
+    pub cx: temp::Context,
+    pub tp: TestProcess,
+}
 
-use super::clitools::hard_link;
-use super::mock::MockInstallerBuilder;
-use super::{CROSS_ARCH1, CROSS_ARCH2, MULTI_ARCH1, create_hash, this_host_triple};
+impl DistContext {
+    pub fn new(mock: MockInstallerBuilder) -> anyhow::Result<Self> {
+        let pkg_dir = tempfile::Builder::new().prefix("rustup").tempdir()?;
+        mock.build(pkg_dir.path());
+
+        let inst_dir = tempfile::Builder::new().prefix("rustup").tempdir()?;
+        let prefix = InstallPrefix::from(inst_dir.path().to_owned());
+        let tmp_dir = tempfile::Builder::new().prefix("rustup").tempdir()?;
+
+        Ok(Self {
+            pkg_dir,
+            inst_dir,
+            prefix,
+            cx: temp::Context::new(
+                tmp_dir.path().to_owned(),
+                DEFAULT_DIST_SERVER,
+                Box::new(|_| ()),
+            ),
+            tp: TestProcess::default(),
+            _tmp_dir: tmp_dir,
+        })
+    }
+
+    pub fn start(&self) -> anyhow::Result<(Transaction<'_>, Components, DirectoryPackage)> {
+        let tx = Transaction::new(
+            self.prefix.clone(),
+            &self.cx,
+            &|_: Notification<'_>| (),
+            &self.tp.process,
+        );
+
+        let components = Components::open(self.prefix.clone())?;
+        let pkg = DirectoryPackage::new(self.pkg_dir.path().to_owned(), true)?;
+        Ok((tx, components, pkg))
+    }
+}
 
 pub(super) struct Release {
     // Either "nightly", "stable", "beta", or an explicit version number

tests/suite/dist_install.rs

@@ -1,18 +1,14 @@
 use std::fs::File;
 use std::io::Write;
 
-use rustup::dist::DEFAULT_DIST_SERVER;
 use rustup::dist::component::Components;
 use rustup::dist::component::Transaction;
 use rustup::dist::component::{DirectoryPackage, Package};
 use rustup::dist::prefix::InstallPrefix;
-use rustup::dist::temp;
 use rustup::notifications::Notification;
-use rustup::process::TestProcess;
+use rustup::test::{DistContext, MockComponentBuilder, MockFile, MockInstallerBuilder};
 use rustup::utils;
 
-use rustup::test::{MockComponentBuilder, MockFile, MockInstallerBuilder};
-
 // Just testing that the mocks work
 #[test]
 fn mock_smoke_test() {
@@ -251,49 +247,3 @@ fn install_to_prefix_that_does_not_exist() {
     // The directory that does not exist
     assert!(utils::path_exists(does_not_exist.join("bin/foo")));
 }
-
-struct DistContext {
-    pkg_dir: tempfile::TempDir,
-    inst_dir: tempfile::TempDir,
-    prefix: InstallPrefix,
-    _tmp_dir: tempfile::TempDir,
-    cx: temp::Context,
-    tp: TestProcess,
-}
-
-impl DistContext {
-    fn new(mock: MockInstallerBuilder) -> anyhow::Result<Self> {
-        let pkg_dir = tempfile::Builder::new().prefix("rustup").tempdir()?;
-        mock.build(pkg_dir.path());
-
-        let inst_dir = tempfile::Builder::new().prefix("rustup").tempdir()?;
-        let prefix = InstallPrefix::from(inst_dir.path().to_owned());
-        let tmp_dir = tempfile::Builder::new().prefix("rustup").tempdir()?;
-
-        Ok(Self {
-            pkg_dir,
-            inst_dir,
-            prefix,
-            cx: temp::Context::new(
-                tmp_dir.path().to_owned(),
-                DEFAULT_DIST_SERVER,
-                Box::new(|_| ()),
-            ),
-            tp: TestProcess::default(),
-            _tmp_dir: tmp_dir,
-        })
-    }
-
-    fn start(&self) -> anyhow::Result<(Transaction<'_>, Components, DirectoryPackage)> {
-        let tx = Transaction::new(
-            self.prefix.clone(),
-            &self.cx,
-            &|_: Notification<'_>| (),
-            &self.tp.process,
-        );
-
-        let components = Components::open(self.prefix.clone())?;
-        let pkg = DirectoryPackage::new(self.pkg_dir.path().to_owned(), true)?;
-        Ok((tx, components, pkg))
-    }
-}