time: prevent time::advance from going too far
#3712
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, `time::advance` would set the mocked clock forward the requested amount, then yield. However, if there was no work ready to perform immediately, this would result in advancing to the next expiring sleep. Now, `time::advance(...)` will unblock at the requested time. The difference between `time::advance(...)` and `time::sleep(...)` is a bit fuzzy. The main difference is `time::sleep(...)` operates on the current task and `time::advance(...)` operates at the runtime level. Fixes #3710
Darksonn
reviewed
Apr 19, 2021
Co-authored-by: Alice Ryhl <alice@ryhl.io>
Darksonn
reviewed
Apr 20, 2021
rcoh
reviewed
Apr 21, 2021
Comment on lines
+15
to
+28
| macro_rules! assert_elapsed { | ||
| ($now:expr, $ms:expr) => {{ | ||
| let elapsed = $now.elapsed(); | ||
| let lower = ms($ms); | ||
|
|
||
| // Handles ms rounding | ||
| assert!( | ||
| elapsed >= lower && elapsed <= lower + ms(1), | ||
| "actual = {:?}, expected = {:?}", | ||
| elapsed, | ||
| lower | ||
| ); | ||
| }}; | ||
| } |
There was a problem hiding this comment.
this would actually be an awesome macro to expose publicly, I end up adding a utility like this in any test cases I write that track time
There was a problem hiding this comment.
We already have similar macros in tokio-test. I don't see why we couldn't have this one there too
Co-authored-by: Alice Ryhl <alice@ryhl.io>
Darksonn
approved these changes
Apr 21, 2021
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously,
time::advancewould set the mocked clock forward therequested amount, then yield. However, if there was no work ready to
perform immediately, this would result in advancing to the next expiring
sleep.
Now,
time::advance(...)will unblock at the requested time. Thedifference between
time::advance(...)andtime::sleep(...)is a bitfuzzy. The main difference is
time::sleep(...)operates on the currenttask and
time::advance(...)operates at the runtime level.Fixes #3710