Adds more mocked tests #711
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
Codecov Report
@@ Coverage Diff @@
## main #711 +/- ##
==========================================
+ Coverage 71.86% 72.23% +0.36%
==========================================
Files 87 86 -1
Lines 11854 11756 -98
==========================================
- Hits 8519 8492 -27
+ Misses 3335 3264 -71 |
128f
force-pushed
the
devices_tests_2
branch
4 times, most recently
from
316453d to
f68c2ee
Compare
128f
force-pushed
the
devices_tests_2
branch
from
f68c2ee to
ddb72cc
Compare
This commit builds on previous work using the mockall library. We add a mock module with signatures of functions we want to mock from `libc` and `libbpf`, and then those mocks are used from the `bpf` module. Tests for the `bpf_query` function required things like setting errors and manipulating the content of c-arrays in the `returning` callback. Signed-off-by: Christian Burke <[email protected]>
128f
commented
Mar 6, 2022
| ) -> ::std::os::raw::c_int { | ||
| unimplemented!(); | ||
| } | ||
| } |
There was a problem hiding this comment.
I needed a stubbed module to apply the mock to.
Do we already do something like this elsewhere?
128f
commented
Mar 6, 2022
| #[cfg(test)] | ||
| #[allow(clippy::too_many_arguments)] | ||
| #[cfg_attr(coverage, feature(no_coverage))] | ||
| pub mod mocks; |
There was a problem hiding this comment.
only used in tests, also libc functions trigger the too_many_arguments clippy warning
128f
commented
Mar 6, 2022
| pub fn load(license: &str, insns: &[u8]) -> Result<RawFd> { | ||
| let insns_cnt = insns.len() / std::mem::size_of::<bpf_insn>(); | ||
| let insns = insns as *const _ as *const bpf_insn; | ||
| #[allow(unused_unsafe)] |
There was a problem hiding this comment.
I don't like this one, but the mocked stuff isn't actually unsafe.
We could probably make it look unsafe though...
| #[cfg(not(test))] | ||
| use libbpf_sys::{ | ||
| bpf_load_program, bpf_prog_attach, bpf_prog_detach2, bpf_prog_get_fd_by_id, bpf_prog_query, | ||
| }; |
There was a problem hiding this comment.
For the above, we are importing mocked versions or not based on if we are in a test environment
Also move extraneous `use` statement. Signed-off-by: Christian Burke <[email protected]>
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.
A follow-up to #706