Unnest rustup's mock crate into the tests

Author: dwijnand

Cargo.lock

@@ -63,7 +63,6 @@ winreg = "0.5.0"
 gcc = "0.3.50"
 
 [dev-dependencies]
-rustup-mock = { path = "src/rustup-mock", version = "1.1.0" }
 lazy_static = "1.0.0"
 
 [workspace]

Cargo.toml

@@ -1,7 +1,9 @@
 //! Yet more cli test cases. These are testing that the output
 //! is exactly as expected.
 
-use rustup_mock::clitools::{
+pub mod mock;
+
+use crate::mock::clitools::{
     self, expect_err_ex, expect_ok, expect_ok_ex, this_host_triple, Config, Scenario,
 };
 

src/rustup-mock/Cargo.toml

@@ -1,8 +1,10 @@
 //! Tests of the interactive console installer
 
+pub mod mock;
+
+use crate::mock::clitools::{self, expect_stdout_ok, Config, SanitizedOutput, Scenario};
+use crate::mock::{get_path, restore_path};
 use lazy_static::lazy_static;
-use rustup_mock::clitools::{self, expect_stdout_ok, Config, SanitizedOutput, Scenario};
-use rustup_mock::{get_path, restore_path};
 use std::io::Write;
 use std::process::Stdio;
 use std::sync::Mutex;

tests/cli-exact.rs

@@ -1,12 +1,14 @@
 //! Test cases of the rustup command that do not depend on the
 //! dist server, mostly derived from multirust/test-v2.sh
 
-use rustup::dist::errors::TOOLSTATE_MSG;
-use rustup::utils::{raw, utils};
-use rustup_mock::clitools::{
+pub mod mock;
+
+use crate::mock::clitools::{
     self, expect_err, expect_ok, expect_ok_ex, expect_stderr_ok, expect_stdout_ok, run,
     set_current_dist_date, this_host_triple, Config, Scenario,
 };
+use rustup::dist::errors::TOOLSTATE_MSG;
+use rustup::utils::{raw, utils};
 
 use std::env::consts::EXE_SUFFIX;
 use tempdir::TempDir;

tests/cli-inst-interactive.rs

@@ -1,10 +1,12 @@
 //! Test cases for new rustup UI
 
-use rustup::utils::raw;
-use rustup_mock::clitools::{
+pub mod mock;
+
+use crate::mock::clitools::{
     self, expect_err, expect_ok, expect_ok_ex, expect_stderr_ok, expect_stdout_ok, run,
     set_current_dist_date, this_host_triple, Config, Scenario,
 };
+use rustup::utils::raw;
 use std::env::consts::EXE_SUFFIX;
 use std::fs;
 use std::path::MAIN_SEPARATOR;

tests/cli-misc.rs

@@ -1,14 +1,16 @@
 //! Testing self install, uninstall and update
 
-use lazy_static::lazy_static;
-use remove_dir_all::remove_dir_all;
-use rustup::utils::{raw, utils};
-use rustup_mock::clitools::{
+pub mod mock;
+
+use crate::mock::clitools::{
     self, expect_err, expect_err_ex, expect_ok, expect_ok_contains, expect_ok_ex, expect_stderr_ok,
     expect_stdout_ok, this_host_triple, Config, Scenario,
 };
-use rustup_mock::dist::calc_hash;
-use rustup_mock::{get_path, restore_path};
+use crate::mock::dist::calc_hash;
+use crate::mock::{get_path, restore_path};
+use lazy_static::lazy_static;
+use remove_dir_all::remove_dir_all;
+use rustup::utils::{raw, utils};
 use std::env;
 use std::env::consts::EXE_SUFFIX;
 use std::fs;

tests/cli-rustup.rs

@@ -1,7 +1,9 @@
 //! Test cases of the rustup command, using v1 manifests, mostly
 //! derived from multirust/test-v2.sh
 
-use rustup_mock::clitools::{
+pub mod mock;
+
+use crate::mock::clitools::{
     self, expect_err, expect_ok, expect_stderr_ok, expect_stdout_ok, set_current_dist_date,
     this_host_triple, Config, Scenario,
 };

tests/cli-self-upd.rs

@@ -1,7 +1,9 @@
 //! Test cases of the rustup command, using v2 manifests, mostly
 //! derived from multirust/test-v2.sh
 
-use rustup_mock::clitools::{
+pub mod mock;
+
+use crate::mock::clitools::{
     self, expect_err, expect_not_stdout_ok, expect_ok, expect_stderr_ok, expect_stdout_ok,
     set_current_dist_date, this_host_triple, Config, Scenario,
 };
@@ -807,8 +809,8 @@ fn remove_target_missing_update_hash() {
 }
 
 fn make_component_unavailable(config: &Config, name: &str, target: &TargetTriple) {
+    use crate::mock::dist::create_hash;
     use rustup::dist::manifest::Manifest;
-    use rustup_mock::dist::create_hash;
 
     let ref manifest_path = config.distdir.join("dist/channel-rust-nightly.toml");
     let ref manifest_str = rustup::utils::raw::read_file(manifest_path).unwrap();

tests/cli-v1.rs

@@ -1,6 +1,10 @@
 // Tests of installation and updates from a v2 Rust distribution
 // server (mocked on the file system)
 
+pub mod mock;
+
+use crate::mock::dist::*;
+use crate::mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};
 use rustup::dist::dist::{TargetTriple, ToolchainDesc, DEFAULT_DIST_SERVER};
 use rustup::dist::download::DownloadCfg;
 use rustup::dist::errors::Result;
@@ -12,8 +16,6 @@ use rustup::dist::ErrorKind;
 use rustup::dist::Notification;
 use rustup::utils::raw as utils_raw;
 use rustup::utils::utils;
-use rustup_mock::dist::*;
-use rustup_mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};
 use std::cell::Cell;
 use std::collections::HashMap;
 use std::fs;

tests/cli-v2.rs

@@ -1,3 +1,6 @@
+pub mod mock;
+
+use crate::mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};
 use rustup::dist::component::Components;
 use rustup::dist::component::Transaction;
 use rustup::dist::component::{DirectoryPackage, Package};
@@ -7,7 +10,6 @@ use rustup::dist::temp;
 use rustup::dist::ErrorKind;
 use rustup::dist::Notification;
 use rustup::utils::utils;
-use rustup_mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};
 use std::fs::File;
 use std::io::Write;
 use tempdir::TempDir;

tests/dist.rs

@@ -1,11 +1,11 @@
 //! A mock distribution server used by tests/cli-v1.rs and
 //! tests/cli-v2.rs
 
-use crate::dist::{
+use crate::mock::dist::{
     change_channel_date, ManifestVersion, MockChannel, MockComponent, MockDistServer, MockPackage,
     MockTargetedPackage,
 };
-use crate::{MockComponentBuilder, MockFile, MockInstallerBuilder};
+use crate::mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};
 use lazy_static::lazy_static;
 use std::cell::RefCell;
 use std::collections::HashMap;

tests/dist_install.rs

@@ -1,7 +1,7 @@
 //! Tools for building and working with the filesystem of a mock Rust
 //! distribution server, with v1 and v2 manifests.
 
-use crate::MockInstallerBuilder;
+use crate::mock::MockInstallerBuilder;
 use lazy_static::lazy_static;
 use sha2::{Digest, Sha256};
 use std::collections::HashMap;
@@ -12,7 +12,7 @@ use std::sync::Mutex;
 use tempdir::TempDir;
 use url::Url;
 
-use crate::clitools::hard_link;
+use crate::mock::clitools::hard_link;
 
 // This function changes the mock manifest for a given channel to that
 // of a particular date. For advancing the build from e.g. 2016-02-1