Skip to content

Commit 80b3582

Browse files
little-arhatwycats
authored andcommitted
rtio removed, use own routines for reading/writing
1 parent 8710362 commit 80b3582

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

tests/unistd.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11

22
extern crate nix;
3-
extern crate native;
43

54
#[cfg(test)]
65
mod test {
7-
use nix::unistd::{writev, readv, Iovec, pipe, close};
8-
use native::io::FileDesc;
9-
use std::rt::rtio::RtioFileStream;
6+
use nix::unistd::{writev, readv, Iovec, pipe, close, read, write};
107
use std::rand::{task_rng, Rng};
118
use std::cmp::min;
129

@@ -32,7 +29,6 @@ mod test {
3229
assert!(pipe_res.is_ok());
3330
let (reader, writer) = pipe_res.ok().unwrap();
3431
// FileDesc will close its filedesc (reader).
35-
let mut reader = FileDesc::new(reader, true);
3632
let mut read_buf = Vec::from_elem(128 * 16, 0u8);
3733
// Blocking io, should write all data.
3834
let write_res = writev(writer, iovecs.as_slice());
@@ -41,7 +37,7 @@ mod test {
4137
let written = write_res.ok().unwrap();
4238
// Check whether we written all data
4339
assert_eq!(to_write.len(), written);
44-
let read_res = reader.read(read_buf.as_mut_slice());
40+
let read_res = read(reader, read_buf.as_mut_slice());
4541
// Successful read
4642
assert!(read_res.is_ok());
4743
let read = read_res.ok().unwrap() as uint;
@@ -51,6 +47,8 @@ mod test {
5147
assert_eq!(to_write.as_slice(), read_buf.as_slice());
5248
let close_res = close(writer);
5349
assert!(close_res.is_ok());
50+
let close_res = close(reader);
51+
assert!(close_res.is_ok());
5452
}
5553

5654
#[test]
@@ -73,10 +71,8 @@ mod test {
7371
let pipe_res = pipe();
7472
assert!(pipe_res.is_ok());
7573
let (reader, writer) = pipe_res.ok().unwrap();
76-
// FileDesc will close its filedesc (writer).
77-
let mut writer = FileDesc::new(writer, true);
7874
// Blocking io, should write all data.
79-
let write_res = writer.write(to_write.as_slice());
75+
let write_res = write(writer, to_write.as_slice());
8076
// Successful write
8177
assert!(write_res.is_ok());
8278
let read_res = readv(reader, iovecs.as_mut_slice());
@@ -95,6 +91,8 @@ mod test {
9591
assert_eq!(read_buf.as_slice(), to_write.as_slice());
9692
let close_res = close(reader);
9793
assert!(close_res.is_ok());
94+
let close_res = close(writer);
95+
assert!(close_res.is_ok());
9896
}
9997

10098

0 commit comments

Comments
 (0)