From 03932d610d72db428fa46dee3500139c6c95151b Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 16 Apr 2019 08:35:58 -0700 Subject: [PATCH] Fix new_warning_with_corrupt_ws missing "USER". Also removed USER in all invocations to avoid this in the future. --- tests/testsuite/support/mod.rs | 1 + tests/testsuite/workspaces.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/testsuite/support/mod.rs b/tests/testsuite/support/mod.rs index 36c146a049d..3c703bfe213 100644 --- a/tests/testsuite/support/mod.rs +++ b/tests/testsuite/support/mod.rs @@ -1679,6 +1679,7 @@ fn _process(t: &OsStr) -> cargo::util::ProcessBuilder { .env_remove("XDG_CONFIG_HOME") // see #2345 .env("GIT_CONFIG_NOSYSTEM", "1") // keep trying to sandbox ourselves .env_remove("EMAIL") + .env_remove("USER") // not set on some rust-lang docker images .env_remove("MFLAGS") .env_remove("MAKEFLAGS") .env_remove("CARGO_MAKEFLAGS") diff --git a/tests/testsuite/workspaces.rs b/tests/testsuite/workspaces.rs index bc4e5dca149..a640aad8e40 100644 --- a/tests/testsuite/workspaces.rs +++ b/tests/testsuite/workspaces.rs @@ -992,6 +992,7 @@ root: [..] fn new_warning_with_corrupt_ws() { let p = project().file("Cargo.toml", "asdf").build(); p.cargo("new bar") + .env("USER", "foo") .with_stderr( "\ [WARNING] compiling this new crate may not work due to invalid workspace configuration