Skip to content

Commit 39abcef

Browse files
committed
Skip timeout upper bound check on windows
1 parent 69a0e1a commit 39abcef

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/libstd/net/tcp.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,9 @@ mod tests {
941941
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
942942
});
943943
assert!(wait > Duration::from_millis(5));
944-
assert!(wait < Duration::from_millis(15));
944+
// windows will sometimes extend this by ~500ms, so we'll just take the
945+
// fact that we did time out as a win :(
946+
assert!(cfg!(windows) || wait < Duration::from_millis(15));
945947
}
946948

947949
#[test]
@@ -964,6 +966,8 @@ mod tests {
964966
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
965967
});
966968
assert!(wait > Duration::from_millis(5));
967-
assert!(wait < Duration::from_millis(15));
969+
// windows will sometimes extend this by ~500ms, so we'll just take the
970+
// fact that we did time out as a win :(
971+
assert!(cfg!(windows) || wait < Duration::from_millis(15));
968972
}
969973
}

src/libstd/net/udp.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,9 @@ mod tests {
397397
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
398398
});
399399
assert!(wait > Duration::from_millis(5));
400-
assert!(wait < Duration::from_millis(15));
400+
// windows will sometimes extend this by ~500ms, so we'll just take the
401+
// fact that we did time out as a win :(
402+
assert!(cfg!(windows) || wait < Duration::from_millis(15));
401403
}
402404

403405
#[test]
@@ -418,6 +420,8 @@ mod tests {
418420
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
419421
});
420422
assert!(wait > Duration::from_millis(5));
421-
assert!(wait < Duration::from_millis(15));
423+
// windows will sometimes extend this by ~500ms, so we'll just take the
424+
// fact that we did time out as a win :(
425+
assert!(cfg!(windows) || wait < Duration::from_millis(15));
422426
}
423427
}

0 commit comments

Comments
 (0)