rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge #5555

Browse Source 
5555: Bump test timeout for macs r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot]
2020-07-28 08:32:49 +00:00
committed by GitHub
parent 020a40335b 97d309ea4b
commit eb99c35b3d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/rust-analyzer/tests/heavy_tests/support.rs
View File

@@ -253,7 +253,8 @@ impl Drop for Server {
} }
fn recv_timeout(receiver: &Receiver<Message>) -> Option<Message> { fn recv_timeout(receiver: &Receiver<Message>) -> Option<Message> {
let timeout = Duration::from_secs(120); let timeout =
if cfg!(target_os = "macos") { Duration::from_secs(300) } else { Duration::from_secs(120) };
select! { select! {
recv(receiver) -> msg => msg.ok(), recv(receiver) -> msg => msg.ok(),
recv(after(timeout)) -> _ => panic!("timed out"), recv(after(timeout)) -> _ => panic!("timed out"),