diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2014-10-03 17:16:05 +0300 |
|---|---|---|
| committer | Eduard Burtescu <edy.burt@gmail.com> | 2014-10-03 17:16:05 +0300 |
| commit | ef693885a78ee21786ae464f590fff6437e43865 (patch) | |
| tree | bd32e8b1a5a3f20e518c35a1df626f566344a691 /src/libstd | |
| parent | 9a2286d3a13c4a97340c99c86c718654f6cb2ed6 (diff) | |
| download | rust-ef693885a78ee21786ae464f590fff6437e43865.tar.gz rust-ef693885a78ee21786ae464f590fff6437e43865.zip | |
Fix a race condition between remove_from_env and other io::process tests.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/process.rs | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index d8be92e4514..8b7d1cd0de5 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -1024,32 +1024,6 @@ mod tests { "didn't find RUN_TEST_NEW_ENV inside of:\n\n{}", output); } - #[test] - fn test_remove_from_env() { - use os; - - // save original environment - let old_env = os::getenv("RUN_TEST_NEW_ENV"); - - os::setenv("RUN_TEST_NEW_ENV", "123"); - let prog = env_cmd().env_remove("RUN_TEST_NEW_ENV").spawn().unwrap(); - let result = prog.wait_with_output().unwrap(); - let output = str::from_utf8_lossy(result.output.as_slice()).into_string(); - - // restore original environment - match old_env { - None => { - os::unsetenv("RUN_TEST_NEW_ENV"); - } - Some(val) => { - os::setenv("RUN_TEST_NEW_ENV", val.as_slice()); - } - } - - assert!(!output.as_slice().contains("RUN_TEST_NEW_ENV"), - "found RUN_TEST_NEW_ENV inside of:\n\n{}", output); - } - #[cfg(unix)] pub fn sleeper() -> Process { Command::new("sleep").arg("1000").spawn().unwrap() |
