-
Notifications
You must be signed in to change notification settings - Fork 506
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: improve dhclient checker and add dhcpd checker #2642
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting fixes needed on this one. I wonder if it would make more sense to merge them? but this looks good for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoops, hit approve too soon.
FAILED test/test_scanner.py::TestScanner::test_version_in_package[http://archive.ubuntu.com/ubuntu/pool/universe/b/busybox/-busybox_1.18.5-1ubuntu4_amd64.deb-busybox-1.18.5-other_products63] - AssertionError: dhcp found in busybox_1.18.5-1ubuntu4_amd64.deb. If that's expected, make sure to add dhcp to the expected list of other_products.
assert 'dhcp' not in {'busybox', 'dhcp', 'dhcpd'}
I guess we can probably just add dhcp to other_products in the dhcpd tests to fix this. Although, as I said, I wouldn't be adverse to combining the checkers given the way the source works here.
- isc:dhcp CPE ID is not only related to ISC DHCP client but also to ISC DHCP server as both components have the same source code - Drop second pattern which is not used to find version in RPM - Add debian and OpenWRT test packages as well as additional signatures - Add dhcpd checker Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
d2cf549
to
325b40d
Compare
Indeed, ISC DHCP client and server share a part of their source code as well as isc:dhcp CPE ID. However, they also have different signatures and additional dedicated CPE IDs (isc:dhcp_client and isc:dhcpd). So, I think we should keep checkers separate. |
Codecov Report
@@ Coverage Diff @@
## main #2642 +/- ##
==========================================
- Coverage 82.72% 82.65% -0.08%
==========================================
Files 634 636 +2
Lines 9970 9980 +10
Branches 1334 1334
==========================================
+ Hits 8248 8249 +1
- Misses 1383 1388 +5
- Partials 339 343 +4
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, let's keep them separate and get this merged. Thank you!
Signed-off-by: Fabrice Fontaine fabrice.fontaine@orange.com