Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix member_manifest_version_error accessing the network.
  • Loading branch information
ehuss committed Mar 31, 2019
commit f01428b647fc087f5ecba14bc94e4f181c0b7307
8 changes: 6 additions & 2 deletions tests/testsuite/member_errors.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
use cargo::core::resolver::ResolveError;
use cargo::core::{compiler::CompileMode, Workspace};
use cargo::core::{compiler::CompileMode, Shell, Workspace};
use cargo::ops::{self, CompileOptions};
use cargo::util::{config::Config, errors::ManifestError};

use crate::support::install::cargo_home;
use crate::support::project;
use crate::support::registry;

/// Tests inclusion of a `ManifestError` pointing to a member manifest
/// when that manifest fails to deserialize.
Expand Down Expand Up @@ -139,7 +141,9 @@ fn member_manifest_version_error() {
.file("bar/src/main.rs", "fn main() {}")
.build();

let config = Config::default().unwrap();
// Prevent this test from accessing the network by setting up .cargo/config.
registry::init();
let config = Config::new(Shell::new(), cargo_home(), cargo_home());
let ws = Workspace::new(&p.root().join("Cargo.toml"), &config).unwrap();
let compile_options = CompileOptions::new(&config, CompileMode::Build).unwrap();
let member_bar = ws.members().find(|m| &*m.name() == "bar").unwrap();
Expand Down