Merge branch 'intel:main' into main

Author: Shrishti1701

cve_bin_tool/output_engine/html.py

@@ -416,11 +416,7 @@ def output_html(
                     vendor=product_info.vendor,
                     name=product_info.product,
                     version=product_info.version,
-                    cve_count=(
-                        0
-                        if cve_data["cves"][0][1] == "UNKNOWN"
-                        else len(cve_data["cves"])
-                    ),
+                    cve_count=(len(cve_data["cves"])),
                     severity_analysis=analysis_pie.to_html(
                         full_html=False, include_plotlyjs=False
                     ),

cve_bin_tool/output_engine/print_mode/templates/content.html

@@ -21,7 +21,7 @@
                     {% else %}
                         <span class="h5">{{ product_info.product }}  {{ product_info.version }}</span>
                     {% endif %}
-                    <span class="h5 float-end mr-5">CVE Count: {{ 0 if (not cve_data["cves"] or cve_data["cves"][0][1] == "UNKNOWN") else cve_data['cves'] | length }}</span><hr \>
+                    <span class="h5 float-end mr-5">CVE Count: {{ 0 if (not cve_data["cves"]) else cve_data['cves'] | length }}</span><hr \>
                 </div>
                 <!-- If CVE Number UNKNOWN don't render -->
                 {% if cve_data["cves"] and cve_data["cves"][0][1] != "UNKNOWN" %}

test/README.md

@@ -159,7 +159,7 @@ To test the filename mappings, rather than making a bunch of empty files, we're
     )
 ```
 
-The function `test_filename_is` will then load the checker you have specified (and fail spectacularly if you specify a checker that does not exist), try to run `get_version()` with an empty file content and the filename you specified, then check that it "is" something (as opposed to "contains") and that the modulename that `get_version` returns is in fact the `expected_result` you specified.
+The function `test_filename_is` will then load the checker you have specified (and fail spectacularly if you specify a checker that does not exist), try to run `get_versions()` with an empty file content and the filename you specified, then check that it "is" something (as opposed to "contains") and that the modulename that `get_versions` returns is in fact the `expected_result` you specified.
 
 For ease of maintenance, please keep the parametrize list in alphabetical order when you add a new tests.