refactor: move tests to the test dir #2257
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
SteveLauC
commented
Dec 10, 2023
| @@ -29,7 +29,6 @@ mod test_poll; | |||
| target_os = "haiku" | |||
| )))] | |||
| mod test_pty; | |||
| mod test_resource; | |||
There was a problem hiding this comment.
resource.rs and timer.rs are under src/sys, so I moved test_resource.rs and test_timer.rs from test/ to test/sys/
SteveLauC
commented
Dec 10, 2023
Comment on lines
-1
to
-6
| #[cfg(not(any( | ||
| target_os = "redox", | ||
| target_os = "fuchsia", | ||
| solarish, | ||
| target_os = "haiku" | ||
| )))] |
There was a problem hiding this comment.
This gate and the below one are removed because we gate them at test/sys/mod.rs:
#[cfg(not(any(
target_os = "redox",
target_os = "fuchsia",
solarish,
target_os = "haiku"
)))]
mod test_resource;
SteveLauC
commented
Dec 10, 2023
| @@ -1774,108 +1774,6 @@ impl<'a> Iterator for IoSliceIterator<'a> { | |||
| } | |||
| } | |||
|
|
|||
| // test contains both recvmmsg and timestaping which is linux only | |||
There was a problem hiding this comment.
Tests in this file have been moved to test/sys/test_socket.rs
SteveLauC
commented
Dec 10, 2023
| udata, | ||
| ); | ||
| assert_eq!(0xdead_beef, actual.ident()); | ||
| assert_eq!(EventFilter::EVFILT_READ, actual.filter().unwrap()); |
There was a problem hiding this comment.
Originally, this line of code was:
let filter = actual.kevent.filter;
assert_eq!(libc::EVFILT_READ, filter);But the kevent field (libc::kevent) of KEvent is private, so I changed it to the corresponding public method .filter()
SteveLauC
commented
Dec 10, 2023
| assert_eq!(libc::EV_ONESHOT | libc::EV_ADD, actual.flags().bits()); | ||
| assert_eq!(libc::NOTE_CHILD | libc::NOTE_EXIT, actual.fflags().bits()); | ||
| assert_eq!(data, actual.data()); | ||
| assert_eq!(udata, actual.udata()); |
There was a problem hiding this comment.
There was 2 type casts:
assert_eq!(udata as type_of_udata, actual.udata() as type_of_udata);But it is not necessary as both sides will return a value in type libc::intptr_t
asomers
approved these changes
Dec 11, 2023
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.
What does this PR do
Move the tests in the
src/xxx.rsto the correspondingtest_xxx.rsin thetestdirectory as discussed in this commentHow to review this PR
The code changes are fairly big, but the real changes should be very small, the best way of reviewing this PR would be checking the changes in
xxx.rs, then take a look attest_xxx.rsto see if there is anything that should not be moved or accidentally changed.I have left some comments on places where special attention is needed, hope that would make review easier.
Checklist:
CONTRIBUTING.md