diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-28 09:32:49 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-28 09:32:49 +0100 |
| commit | eb99c35b3da43020df074b91243f6b51d792d116 (patch) | |
| tree | 765b724580dcc213f0772b94c7cecd8b318750c9 | |
| parent | 020a40335bb2d45245d1164e4075e7f622084705 (diff) | |
| parent | 97d309ea4b152e356866fdee131544c3910b9faf (diff) | |
Merge #5555
5555: Bump test timeout for macs r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
| -rw-r--r-- | crates/rust-analyzer/tests/heavy_tests/support.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/rust-analyzer/tests/heavy_tests/support.rs b/crates/rust-analyzer/tests/heavy_tests/support.rs index e152264d3..f242c8165 100644 --- a/crates/rust-analyzer/tests/heavy_tests/support.rs +++ b/crates/rust-analyzer/tests/heavy_tests/support.rs | |||
| @@ -253,7 +253,8 @@ impl Drop for Server { | |||
| 253 | } | 253 | } |
| 254 | 254 | ||
| 255 | fn recv_timeout(receiver: &Receiver<Message>) -> Option<Message> { | 255 | fn recv_timeout(receiver: &Receiver<Message>) -> Option<Message> { |
| 256 | let timeout = Duration::from_secs(120); | 256 | let timeout = |
| 257 | if cfg!(target_os = "macos") { Duration::from_secs(300) } else { Duration::from_secs(120) }; | ||
| 257 | select! { | 258 | select! { |
| 258 | recv(receiver) -> msg => msg.ok(), | 259 | recv(receiver) -> msg => msg.ok(), |
| 259 | recv(after(timeout)) -> _ => panic!("timed out"), | 260 | recv(after(timeout)) -> _ => panic!("timed out"), |