-
Notifications
You must be signed in to change notification settings - Fork 465
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
feat: helper_script: try without lib prefix. update name detect #2962
base: main
Are you sure you want to change the base?
Conversation
bcieszko
commented
Apr 28, 2023
- fixes feat: let helper_script.py search for both libXYZ and XYZ #2918
updated commit - cleanup black/isort/flake8 |
* fixes intel#2918 Signed-off-by: Przemyslaw Romaniak <[email protected]> Signed-off-by: Bartlomiej Cieszkowski <[email protected]>
updated branch |
@terriko can we merge this? |
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.
We're getting a bunch of test fails:
=========================== short test summary info ============================
FAILED test/test_helper_script.py::TestHelperScript::test_parse_filename[libsndfile-1.0.25-12.el7.x86_64.rpm-libsndfile-1.0.25] - AssertionError: assert ('libsndfile', '1.0.25') == None
+ where None = <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e0895cd0>>('libsndfile-1.0.25-12.el7.x86_64.rpm')
+ where <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e0895cd0>> = <cve_bin_tool.helper_script.HelperScript object at 0x7f72e0895cd0>.parse_filename
FAILED test/test_helper_script.py::TestHelperScript::test_parse_filename[libsndfile-1.0.31-1-aarch64.pkg.tar.xz-libsndfile-1.0.31] - AssertionError: assert ('libsndfile', '1.0.31') == None
+ where None = <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e1897bd0>>('libsndfile-1.0.31-1-aarch64.pkg.tar.xz')
+ where <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e1897bd0>> = <cve_bin_tool.helper_script.HelperScript object at 0x7f72e1897bd0>.parse_filename
FAILED test/test_helper_script.py::TestHelperScript::test_parse_filename[logrotate_3.14.0-4ubuntu5_amd64.deb-logrotate-3.14.0] - AssertionError: assert ('logrotate', '3.14.0') == None
+ where None = <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e1897890>>('logrotate_3.14.0-4ubuntu5_amd64.deb')
+ where <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e1897890>> = <cve_bin_tool.helper_script.HelperScript object at 0x7f72e1897890>.parse_filename
FAILED test/test_helper_script.py::TestHelperScript::test_parse_filename[libarchive_3.4.2-1_aarch64_cortex-a72.ipk-libarchive-3.4.2] - AssertionError: assert ('libarchive', '3.4.2') == None
+ where None = <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e1897a90>>('libarchive_3.4.2-1_aarch64_cortex-a72.ipk')
+ where <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e1897a90>> = <cve_bin_tool.helper_script.HelperScript object at 0x7f72e1897a90>.parse_filename
FAILED test/test_helper_script.py::TestHelperScript::test_parse_filename[tomcat9_9.0.37-3_all.deb-tomcat9-9.0.37] - AssertionError: assert ('tomcat9', '9.0.37') == None
+ where None = <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e188f850>>('tomcat9_9.0.37-3_all.deb')
+ where <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e188f850>> = <cve_bin_tool.helper_script.HelperScript object at 0x7f72e188f850>.parse_filename
FAILED test/test_helper_script.py::TestHelperScript::test_parse_filename[openssh-client_8.4p1-5ubuntu1_amd64.deb-openssh-client-8.4p1] - AssertionError: assert ('openssh-client', '8.4p1') == None
+ where None = <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e16db390>>('openssh-client_8.4p1-5ubuntu1_amd64.deb')
+ where <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e16db390>> = <cve_bin_tool.helper_script.HelperScript object at 0x7f72e16db390>.parse_filename
FAILED test/test_helper_script.py::TestHelperScript::test_parse_filename[./Packages/bash-4.2.46-34.el7.x86_64.rpm-bash-4.2.46] - AssertionError: assert ('bash', '4.2.46') == None
+ where None = <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e16e4210>>('./Packages/bash-4.2.46-34.el7.x86_64.rpm')
+ where <bound method HelperScript.parse_filename of <cve_bin_tool.helper_script.HelperScript object at 0x7f72e16e4210>> = <cve_bin_tool.helper_script.HelperScript object at 0x7f72e16e4210>.parse_filename
===== 7 failed, 1628 passed, 59 skipped, 33 warnings in 977.54s (0:16:17) ======
At a glance: there is a test for libsndfile that might need to be updated before it can pass because of the lib prefix change, but some of the others look like they shouldn't have changed behaviour so there may be some code tweaking that needs to happen to get them passing again so we can get this merged.
All those failures are raised because this PR replaces this line:
by this one:
As a result, The issue can easily be reproduced outside of unit tests through:
|