From 204b23fc925c26068e96e9d650c7d180ea71befb Mon Sep 17 00:00:00 2001
From: Tom Fay <t.h.facer@gmail.com>
Date: Thu, 26 Sep 2019 12:16:48 +0100
Subject: [PATCH] Remove alternative dep from upgrade test

---
 src/bin/upgrade/main.rs                  | 9 ++++-----
 src/fetch.rs                             | 2 +-
 tests/fixtures/upgrade/Cargo.toml.source | 2 +-
 tests/fixtures/upgrade/Cargo.toml.target | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/bin/upgrade/main.rs b/src/bin/upgrade/main.rs
index c5ef5e3cff..8ba403fbe6 100644
--- a/src/bin/upgrade/main.rs
+++ b/src/bin/upgrade/main.rs
@@ -22,7 +22,6 @@ use cargo_edit::{
 use failure::Fail;
 use itertools::Itertools;
 use std::collections::HashMap;
-use std::env;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::process;
@@ -157,7 +156,7 @@ impl Manifests {
             }
         }
 
-        // Map the names of user-specified dependencies to the (optionally) requested version. 
+        // Map the names of user-specified dependencies to the (optionally) requested version.
         let selected_dependencies = only_update
             .into_iter()
             .map(|name| {
@@ -229,7 +228,7 @@ impl Manifests {
     }
 }
 
-/// The set of dependencies to be upgraded, alongside the registries returned from cargo metadata, and 
+/// The set of dependencies to be upgraded, alongside the registries returned from cargo metadata, and
 /// the desired versions, if specified by the user.
 struct DesiredUpgrades(HashMap<String, (Option<String>, Option<String>)>);
 
@@ -297,8 +296,8 @@ fn process(args: Args) -> Result<()> {
     let existing_dependencies = manifests.get_dependencies(dependency)?;
 
     // Update indices for any alternative registries, unless
-    // we're offline or testing.
-    if !args.offline || env::var("CARGO_IS_TEST").is_ok() {
+    // we're offline.
+    if !args.offline {
         for registry_url in existing_dependencies
             .0
             .values()
diff --git a/src/fetch.rs b/src/fetch.rs
index b0a3ff47af..a210e3f0a9 100644
--- a/src/fetch.rs
+++ b/src/fetch.rs
@@ -25,7 +25,7 @@ struct CrateVersion {
 ///
 /// The registry argument must be specified for crates
 /// from alternative registries.
-/// 
+///
 /// The latest version will be returned as a `Dependency`. This will fail, when
 ///
 /// - there is no Internet connection and offline is false.
diff --git a/tests/fixtures/upgrade/Cargo.toml.source b/tests/fixtures/upgrade/Cargo.toml.source
index ede93401d4..728c6c79a3 100644
--- a/tests/fixtures/upgrade/Cargo.toml.source
+++ b/tests/fixtures/upgrade/Cargo.toml.source
@@ -19,7 +19,7 @@ version = "0.7"
 
 [dev-dependencies]
 assert_cli = "0.2.0"
-tempdir = { version = "0.3", registry = "alternative" }
+tempdir = "0.3"
 
 [build-dependencies]
 serde = { version = "1.0", git= "https://github.com/serde-rs/serde.git" }
diff --git a/tests/fixtures/upgrade/Cargo.toml.target b/tests/fixtures/upgrade/Cargo.toml.target
index c8cdae4ab9..c0808d9963 100644
--- a/tests/fixtures/upgrade/Cargo.toml.target
+++ b/tests/fixtures/upgrade/Cargo.toml.target
@@ -19,7 +19,7 @@ version = "semver--CURRENT_VERSION_TEST"
 
 [dev-dependencies]
 assert_cli = "assert_cli--CURRENT_VERSION_TEST"
-tempdir = { version = "tempdir--CURRENT_VERSION_TEST", registry = "alternative" }
+tempdir = "tempdir--CURRENT_VERSION_TEST"
 
 [build-dependencies]
 serde = { version = "1.0", git= "https://github.com/serde-rs/serde.git" }