Skip to content

Commit

Permalink
Fix test fallout
Browse files Browse the repository at this point in the history
  • Loading branch information
brson committed Aug 13, 2014
1 parent 02e39b0 commit 075256a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/test/run-pass/tcp-connect-timeouts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ iotest!(fn timeout_error() {

iotest!(fn connect_timeout_zero() {
let addr = next_test_ip4();
assert!(TcpStream::connect_timeout(&addr, Duration::milliseconds(0)).is_err());
assert!(TcpStream::connect_timeout(addr, Duration::milliseconds(0)).is_err());
})

iotest!(fn connect_timeout_negative() {
let addr = next_test_ip4();
assert!(TcpStream::connect_timeout(&addr, Duration::milliseconds(-1)).is_err());
assert!(TcpStream::connect_timeout(addr, Duration::milliseconds(-1)).is_err());
})

3 changes: 2 additions & 1 deletion src/test/run-pass/tcp-stress.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ extern crate debug;
use std::io::net::tcp::{TcpListener, TcpStream};
use std::io::{Acceptor, Listener};
use std::task::TaskBuilder;
use std::time::Duration;

#[start]
fn start(argc: int, argv: *const *const u8) -> int {
Expand All @@ -33,7 +34,7 @@ fn main() {
// This test has a chance to time out, try to not let it time out
spawn(proc() {
use std::io::timer;
timer::sleep(30 * 1000);
timer::sleep(Duration::milliseconds(30 * 1000));
println!("timed out!");
unsafe { libc::exit(1) }
});
Expand Down

5 comments on commit 075256a

@bors
Copy link
Contributor

@bors bors commented on 075256a Aug 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from aturon
at brson@075256a

@bors
Copy link
Contributor

@bors bors commented on 075256a Aug 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/dur = 075256a into auto

@bors
Copy link
Contributor

@bors bors commented on 075256a Aug 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/dur = 075256a merged ok, testing candidate = 28b5e45

@bors
Copy link
Contributor

@bors bors commented on 075256a Aug 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 28b5e45

Please sign in to comment.