Merge #5555

bors[bot] · matklad · web-flow · commit eb99c35b3da4 · 2020-07-28T08:32:49.000Z
5555: Bump test timeout for macs r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov &lt;aleksey.kladov@gmail.com&gt;
diff --git 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 {
 }
 
 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! {
         recv(receiver) -> msg => msg.ok(),
         recv(after(timeout)) -> _ => panic!("timed out"),

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,8 @@ impl Drop for Server {`
`253`	`253`	`}`
`254`	`254`
`255`	`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`	`258`	`select! {`
`258`	`259`	`recv(receiver) -> msg => msg.ok(),`
`259`	`260`	`recv(after(timeout)) -> _ => panic!("timed out"),`