]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #17739 : eddyb/fix-process-test
authorAlex Crichton <alex@alexcrichton.com>
Fri, 3 Oct 2014 14:39:45 +0000 (07:39 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Fri, 3 Oct 2014 14:39:45 +0000 (07:39 -0700)
1  2 
src/libstd/io/process.rs

diff --combined src/libstd/io/process.rs
index 73a8aa442c1fda6e21fb5b2d82210cfc3ade4601,8b7d1cd0de580d94dd165f303c70ed734932c83e..ef336bc7b4f99f4a07cfbd773bfeef5551cd83bd
@@@ -11,7 -11,6 +11,7 @@@
  //! Bindings for executing child processes
  
  #![allow(experimental)]
 +#![allow(non_uppercase_statics)]
  
  use prelude::*;
  
@@@ -1025,32 -1024,6 +1025,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()