diff options
author | Alex Crichton <alex@alexcrichton.com> | 2015-02-26 09:38:18 -0800 |
---|---|---|
committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-26 09:38:18 -0800 |
commit | e5198d341ce20cab06193b922e1ccfeb6985e769 (patch) | |
tree | 490dd8e5deac08d8b1b4abbf5b4272f8c6f6dcd8 /tests | |
parent | 812c36bed2e82468f7de9236d570c73b46be8db2 (diff) | |
download | ssh2-rs-e5198d341ce20cab06193b922e1ccfeb6985e769.zip |
Bump libssh2-sys to 0.1.10
Diffstat (limited to 'tests')
-rw-r--r-- | tests/all.rs | 3 | ||||
-rw-r--r-- | tests/session.rs | 3 | ||||
-rw-r--r-- | tests/sftp.rs | 4 | ||||
-rw-r--r-- | tests/tempdir.rs | 17 |
4 files changed, 3 insertions, 24 deletions
diff --git a/tests/all.rs b/tests/all.rs index b905530..9ff2e0c 100644 --- a/tests/all.rs +++ b/tests/all.rs @@ -1,5 +1,5 @@ #![deny(warnings)] -#![feature(io, core, path, env, net, fs, old_io, old_path)] +#![feature(io, core, path, env, net, fs, tempdir)] extern crate ssh2; extern crate libc; @@ -12,7 +12,6 @@ mod session; mod channel; mod knownhosts; mod sftp; -mod tempdir; pub fn socket() -> TcpStream { TcpStream::connect("127.0.0.1:22").unwrap() diff --git a/tests/session.rs b/tests/session.rs index 36f8c7c..fbfadfc 100644 --- a/tests/session.rs +++ b/tests/session.rs @@ -1,8 +1,7 @@ use std::env; -use std::fs::File; +use std::fs::{File, TempDir}; use std::io::prelude::*; use std::path::{Path, PathBuf}; -use tempdir::TempDir; use ssh2::{Session, MethodType, HashType}; diff --git a/tests/sftp.rs b/tests/sftp.rs index c0940a5..774ba86 100644 --- a/tests/sftp.rs +++ b/tests/sftp.rs @@ -1,7 +1,5 @@ use std::io::prelude::*; -use std::fs::{self, File}; - -use tempdir::TempDir; +use std::fs::{self, File, TempDir}; #[test] fn smoke() { diff --git a/tests/tempdir.rs b/tests/tempdir.rs deleted file mode 100644 index 2f83e40..0000000 --- a/tests/tempdir.rs +++ /dev/null @@ -1,17 +0,0 @@ -use std::old_io; -use std::io; -use std::path; - -pub struct TempDir { - inner: old_io::TempDir, -} - -impl TempDir { - pub fn new(prefix: &str) -> io::Result<TempDir> { - Ok(TempDir { inner: old_io::TempDir::new(prefix).unwrap() }) - } - - pub fn path(&self) -> &path::Path { - path::Path::new(self.inner.path().as_str().unwrap()) - } -} |