Skip to content

Commit 34b82d8

Browse files
authored
test: re-enable some disabled tests (#4376)
* replaces #4353 * partial fix for #4243 Re-enables the tests that are now passing consistently, fixes expectations for zstandard vendor. Signed-off-by: Terri Oda <[email protected]>
1 parent 9f8d4d9 commit 34b82d8

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

test/test_csv2cve.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212

1313
class TestCSV2CVE:
14-
@pytest.mark.skip(reason="Cache is broken, disabling temporarily")
1514
@pytest.mark.asyncio
1615
async def test_csv2cve_valid_file(self, caplog):
1716
file_path = join(dirname(__file__), "csv", "triage.csv")

test/test_exploits.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ class TestExploitScanner:
8181
),
8282
),
8383
)
84-
@pytest.mark.skip(reason="Cache is broken, disabling temporarily")
8584
def test_exploit_checker(
8685
self, check_exploits, exploits_list, product_info, triage_info, expected_result
8786
):

test/test_language_scanner.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from cve_bin_tool import parsers
1212
from cve_bin_tool.cvedb import CVEDB
1313
from cve_bin_tool.log import LOGGER
14-
from cve_bin_tool.util import ProductInfo
1514
from cve_bin_tool.version_scanner import VersionScanner
1615

1716

@@ -369,7 +368,6 @@ def test_language_package(
369368
assert p in found_product
370369
assert file_path == filename
371370

372-
@pytest.mark.skip(reason="Cache is broken, disabling temporarily")
373371
@pytest.mark.parametrize("filename", ((str(TEST_FILE_PATH / "PKG-INFO")),))
374372
def test_python_package(self, filename: str) -> None:
375373
"""Test against python's PKG-INFO metadata file"""
@@ -378,7 +376,7 @@ def test_python_package(self, filename: str) -> None:
378376
for product in scanner.scan_file(filename):
379377
if product:
380378
product_info, file_path = product
381-
assert product_info == ProductInfo(
382-
"facebook", "zstandard", "0.18.0", filename
383-
)
379+
assert product_info[1] == "zstandard"
380+
assert product_info[2] == "0.18.0"
381+
assert product_info[3] == filename
384382
assert file_path == filename

0 commit comments

Comments
 (0)