1
1
2
2
extern crate nix;
3
- extern crate native;
4
3
5
4
#[ cfg( test) ]
6
5
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} ;
10
7
use std:: rand:: { task_rng, Rng } ;
11
8
use std:: cmp:: min;
12
9
@@ -32,7 +29,6 @@ mod test {
32
29
assert ! ( pipe_res. is_ok( ) ) ;
33
30
let ( reader, writer) = pipe_res. ok ( ) . unwrap ( ) ;
34
31
// FileDesc will close its filedesc (reader).
35
- let mut reader = FileDesc :: new ( reader, true ) ;
36
32
let mut read_buf = Vec :: from_elem ( 128 * 16 , 0u8 ) ;
37
33
// Blocking io, should write all data.
38
34
let write_res = writev ( writer, iovecs. as_slice ( ) ) ;
@@ -41,7 +37,7 @@ mod test {
41
37
let written = write_res. ok ( ) . unwrap ( ) ;
42
38
// Check whether we written all data
43
39
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 ( ) ) ;
45
41
// Successful read
46
42
assert ! ( read_res. is_ok( ) ) ;
47
43
let read = read_res. ok ( ) . unwrap ( ) as uint ;
@@ -51,6 +47,8 @@ mod test {
51
47
assert_eq ! ( to_write. as_slice( ) , read_buf. as_slice( ) ) ;
52
48
let close_res = close ( writer) ;
53
49
assert ! ( close_res. is_ok( ) ) ;
50
+ let close_res = close ( reader) ;
51
+ assert ! ( close_res. is_ok( ) ) ;
54
52
}
55
53
56
54
#[ test]
@@ -73,10 +71,8 @@ mod test {
73
71
let pipe_res = pipe ( ) ;
74
72
assert ! ( pipe_res. is_ok( ) ) ;
75
73
let ( reader, writer) = pipe_res. ok ( ) . unwrap ( ) ;
76
- // FileDesc will close its filedesc (writer).
77
- let mut writer = FileDesc :: new ( writer, true ) ;
78
74
// 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 ( ) ) ;
80
76
// Successful write
81
77
assert ! ( write_res. is_ok( ) ) ;
82
78
let read_res = readv ( reader, iovecs. as_mut_slice ( ) ) ;
@@ -95,6 +91,8 @@ mod test {
95
91
assert_eq ! ( read_buf. as_slice( ) , to_write. as_slice( ) ) ;
96
92
let close_res = close ( reader) ;
97
93
assert ! ( close_res. is_ok( ) ) ;
94
+ let close_res = close ( writer) ;
95
+ assert ! ( close_res. is_ok( ) ) ;
98
96
}
99
97
100
98
0 commit comments