nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 04:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Easier to debug timeouts in tests

Browse Source
This commit is contained in:
Aleksey Kladov 2021-01-28 16:00:33 +03:00
parent ad3cb2125d
commit a58fa29dc2
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crates/rust-analyzer/tests/rust-analyzer/support.rs
View File

@ -188,8 +188,8 @@ impl Server {
} }
fn send_request_(&self, r: Request) -> Value { fn send_request_(&self, r: Request) -> Value {
let id = r.id.clone(); let id = r.id.clone();
self.client.sender.send(r.into()).unwrap(); self.client.sender.send(r.clone().into()).unwrap();
while let Some(msg) = self.recv() { while let Some(msg) = self.recv().unwrap_or_else(|Timeout| panic!("timeout: {:?}", r)) {
match msg { match msg {
Message::Request(req) => { Message::Request(req) => {
if req.method == "window/workDoneProgress/create" { if req.method == "window/workDoneProgress/create" {
@ -216,7 +216,7 @@ impl Server {
} }
} }
} }
panic!("no response"); panic!("no response for {:?}", r);
} }
pub(crate) fn wait_until_workspace_is_loaded(self) -> Server { pub(crate) fn wait_until_workspace_is_loaded(self) -> Server {
self.wait_for_message_cond(1, &|msg: &Message| match msg { self.wait_for_message_cond(1, &|msg: &Message| match msg {
@ -230,10 +230,15 @@ impl Server {
} }
} }
_ => false, _ => false,
}); })
.unwrap_or_else(|Timeout| panic!("timeout while waiting for ws to load"));
self self
} }
fn wait_for_message_cond(&self, n: usize, cond: &dyn Fn(&Message) -> bool) { fn wait_for_message_cond(
&self,
n: usize,
cond: &dyn Fn(&Message) -> bool,
) -> Result<(), Timeout> {
let mut total = 0; let mut total = 0;
for msg in self.messages.borrow().iter() { for msg in self.messages.borrow().iter() {
if cond(msg) { if cond(msg) {
@ -241,17 +246,20 @@ impl Server {
} }
} }
while total < n { while total < n {
let msg = self.recv().expect("no response"); let msg = self.recv()?.expect("no response");
if cond(&msg) { if cond(&msg) {
total += 1; total += 1;
} }
} }
Ok(())
} }
fn recv(&self) -> Option<Message> { fn recv(&self) -> Result<Option<Message>, Timeout> {
recv_timeout(&self.client.receiver).map(|msg| { let msg = recv_timeout(&self.client.receiver)?;
let msg = msg.map(|msg| {
self.messages.borrow_mut().push(msg.clone()); self.messages.borrow_mut().push(msg.clone());
msg msg
}) });
Ok(msg)
} }
fn send_notification(&self, not: Notification) { fn send_notification(&self, not: Notification) {
self.client.sender.send(Message::Notification(not)).unwrap(); self.client.sender.send(Message::Notification(not)).unwrap();
@ -269,11 +277,13 @@ impl Drop for Server {
} }
} }
fn recv_timeout(receiver: &Receiver<Message>) -> Option<Message> { struct Timeout;
fn recv_timeout(receiver: &Receiver<Message>) -> Result<Option<Message>, Timeout> {
let timeout = let timeout =
if cfg!(target_os = "macos") { Duration::from_secs(300) } else { Duration::from_secs(120) }; if cfg!(target_os = "macos") { Duration::from_secs(300) } else { Duration::from_secs(120) };
select! { select! {
recv(receiver) -> msg => msg.ok(), recv(receiver) -> msg => Ok(msg.ok()),
recv(after(timeout)) -> _ => panic!("timed out"), recv(after(timeout)) -> _ => Err(Timeout),
} }
} }