summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-10-09 08:08:11 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-10-09 08:08:11 -0700
commitc3bdc51b55bf54e0eddd9beefcf00eaa16d490e2 (patch)
treeab14dc889102031c0ae34de1ad0fa45ad0654f49 /tests
parent5e663e0384151659f28d843eff56b801ecbbe2c2 (diff)
downloadssh2-rs-c3bdc51b55bf54e0eddd9beefcf00eaa16d490e2.zip
Update to rust master
Diffstat (limited to 'tests')
-rw-r--r--tests/session.rs2
-rw-r--r--tests/sftp.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/session.rs b/tests/session.rs
index e3275d1..a2cc1f0 100644
--- a/tests/session.rs
+++ b/tests/session.rs
@@ -65,7 +65,7 @@ fn scp_send() {
let td = TempDir::new("test").unwrap();
let (_tcp, sess) = ::authed_session();
let mut ch = sess.scp_send(&td.path().join("foo"),
- io::UserFile, 6, None).unwrap();
+ io::USER_FILE, 6, None).unwrap();
ch.write(b"foobar").unwrap();
drop(ch);
let actual = File::open(&td.path().join("foo")).read_to_end().unwrap();
diff --git a/tests/sftp.rs b/tests/sftp.rs
index 1abf02b..aa94260 100644
--- a/tests/sftp.rs
+++ b/tests/sftp.rs
@@ -11,13 +11,13 @@ fn smoke() {
fn ops() {
let td = TempDir::new("foo").unwrap();
File::create(&td.path().join("foo")).unwrap();
- fs::mkdir(&td.path().join("bar"), io::UserDir).unwrap();
+ fs::mkdir(&td.path().join("bar"), io::USER_DIR).unwrap();
let (_tcp, sess) = ::authed_session();
let sftp = sess.sftp().unwrap();
sftp.opendir(&td.path().join("bar")).unwrap();
let mut foo = sftp.open(&td.path().join("foo")).unwrap();
- sftp.mkdir(&td.path().join("bar2"), io::UserDir).unwrap();
+ sftp.mkdir(&td.path().join("bar2"), io::USER_DIR).unwrap();
assert!(td.path().join("bar2").is_dir());
sftp.rmdir(&td.path().join("bar2")).unwrap();