Skip to content

Commit 262184d

Browse files
committed
test(rmw): stop the timeout message naming only one cause
assert_completes is now shared by tests whose blocking has three different causes; asserting the original one for all of them misdescribes two.
1 parent 752a8a5 commit 262184d

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

crates/rmw-zenoh-rs/src/exec_callback.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,11 @@ mod tests {
468468
match rx.recv_timeout(DEADLOCK_TIMEOUT) {
469469
Ok(v) => v,
470470
Err(_) => panic!(
471-
"{what} did not return within {DEADLOCK_TIMEOUT:?} — the executor \
472-
callback was invoked while a guard on the same mutex was live, so \
473-
the re-entrant call is blocked on this thread's own lock"
471+
"{what} did not return within {DEADLOCK_TIMEOUT:?}, so it is blocked. \
472+
The causes this suite distinguishes: a guard on the state mutex was \
473+
still live across the dispatch (the original defect); the in-flight \
474+
wait counted this thread and is waiting on itself; or a finished \
475+
dispatch failed to deregister and the wait can never be satisfied"
474476
),
475477
}
476478
}

0 commit comments

Comments
 (0)