mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
misc: Eliminate use of assert!((...).is_ok())
Asserting on .is_ok()/.is_err() leads to hard to debug failures (as if the test fails, it will only say "assertion failed: false". We replace these with `.unwrap()`, which also prints the exact error variant that was unexpectedly encountered (we can to this these days thanks to efforts to implement Display and Debug for our error types). If the assert!((...).is_ok()) was followed by an .unwrap() anyway, we just drop the assert. Inspired by and quoted from @roypat. Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
This commit is contained in:
@@ -388,7 +388,7 @@ pub(crate) mod tests {
|
||||
// wait the other half of the timer period
|
||||
thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
|
||||
// the timer_fd should have an event on it by now
|
||||
assert!(h.event_handler().is_ok());
|
||||
h.event_handler().unwrap();
|
||||
// limiter should now be unblocked
|
||||
assert!(!h.is_blocked());
|
||||
// try and succeed on another 100 bytes this time
|
||||
@@ -424,7 +424,7 @@ pub(crate) mod tests {
|
||||
// wait the other half of the timer period
|
||||
thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
|
||||
// the timer_fd should have an event on it by now
|
||||
assert!(h.event_handler().is_ok());
|
||||
h.event_handler().unwrap();
|
||||
// limiter should now be unblocked
|
||||
assert!(!h.is_blocked());
|
||||
// try and succeed on another 100 ops this time
|
||||
@@ -461,7 +461,7 @@ pub(crate) mod tests {
|
||||
// wait the other half of the timer period
|
||||
thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
|
||||
// the timer_fd should have an event on it by now
|
||||
assert!(h.event_handler().is_ok());
|
||||
h.event_handler().unwrap();
|
||||
// limiter should now be unblocked
|
||||
assert!(!h.is_blocked());
|
||||
// try and succeed on another 100 ops this time
|
||||
@@ -491,7 +491,7 @@ pub(crate) mod tests {
|
||||
// after 1.5x the replenish time has passed, the rate limiter
|
||||
// is available again
|
||||
thread::sleep(Duration::from_millis(500));
|
||||
assert!(h.event_handler().is_ok());
|
||||
h.event_handler().unwrap();
|
||||
assert!(!h.is_blocked());
|
||||
|
||||
// reset the rate limiter
|
||||
@@ -525,7 +525,7 @@ pub(crate) mod tests {
|
||||
// after waiting out the full duration, rate limiter should be
|
||||
// available again
|
||||
thread::sleep(Duration::from_millis(200));
|
||||
assert!(h.event_handler().is_ok());
|
||||
h.event_handler().unwrap();
|
||||
assert!(!h.is_blocked());
|
||||
assert!(h.consume(100, TokenType::Bytes));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user