Update android tests to reflect API switch from `os::env` to `env::vars`.
This commit is contained in:
parent
8dff0ac143
commit
2b71aed003
|
@ -1074,7 +1074,7 @@ mod tests {
|
|||
let mut prog = env_cmd().spawn().unwrap();
|
||||
let output = String::from_utf8(prog.wait_with_output().unwrap().output).unwrap();
|
||||
|
||||
let r = env::vars();
|
||||
let r = ::env::vars();
|
||||
for (k, v) in r {
|
||||
// don't check android RANDOM variables
|
||||
if k != "RANDOM".to_string() {
|
||||
|
|
|
@ -832,14 +832,13 @@ mod tests {
|
|||
#[cfg(target_os="android")]
|
||||
#[test]
|
||||
fn test_inherit_env() {
|
||||
use os;
|
||||
use std::env;
|
||||
if running_on_valgrind() { return; }
|
||||
|
||||
let mut result = env_cmd().output().unwrap();
|
||||
let output = String::from_utf8(result.stdout).unwrap();
|
||||
|
||||
let r = os::env();
|
||||
for &(ref k, ref v) in &r {
|
||||
for (ref k, ref v) in env::vars() {
|
||||
// don't check android RANDOM variables
|
||||
if *k != "RANDOM".to_string() {
|
||||
assert!(output.contains(&format!("{}={}",
|
||||
|
|
Loading…
Reference in New Issue