summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-12 11:04:49 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-12 11:04:56 -0800
commit8baa8ccb39cd1a43362d2a1ee87d8c3b91496cd7 (patch)
tree9f76cc4846b436742b6930c7aaf90e34a873eb54 /tests
parentbe8fd87e921f0bd7dbd0ef32b38cd9d0ae861058 (diff)
downloadssh2-rs-8baa8ccb39cd1a43362d2a1ee87d8c3b91496cd7.zip
Update to rust master
Diffstat (limited to 'tests')
-rw-r--r--tests/all.rs2
-rw-r--r--tests/session.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/all.rs b/tests/all.rs
index 46c1110..749e976 100644
--- a/tests/all.rs
+++ b/tests/all.rs
@@ -18,7 +18,7 @@ pub fn socket() -> TcpStream {
}
pub fn authed_session() -> (TcpStream, ssh2::Session) {
- let user = env::var_string("USER").unwrap();
+ let user = env::var("USER").unwrap();
let socket = socket();
let mut sess = ssh2::Session::new().unwrap();
sess.handshake(&socket).unwrap();
diff --git a/tests/session.rs b/tests/session.rs
index 480f761..8a97710 100644
--- a/tests/session.rs
+++ b/tests/session.rs
@@ -23,7 +23,7 @@ fn smoke() {
#[test]
fn smoke_handshake() {
- let user = env::var_string("USER").unwrap();
+ let user = env::var("USER").unwrap();
let socket = ::socket();
let mut sess = Session::new().unwrap();
sess.handshake(&socket).unwrap();
@@ -55,7 +55,7 @@ fn scp_recv() {
let (_tcp, sess) = ::authed_session();
let (mut ch, _) = sess.scp_recv(&Path::new(".ssh/authorized_keys")).unwrap();
let data = ch.read_to_string().unwrap();
- let p = Path::new(env::var_string("HOME").unwrap()).join(".ssh/authorized_keys");
+ let p = Path::new(env::var("HOME").unwrap()).join(".ssh/authorized_keys");
let expected = File::open(&p).read_to_string().unwrap();
assert!(data == expected);
}