Skip to content
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.

Sign up for GitHub

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

test: re-enable failing tests from #3653 #3720

Merged
merged 4 commits into from
Jan 12, 2024
Merged

test: re-enable failing tests from #3653 #3720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff25d99
test: try re-enabling exploit test
terriko Jan 11, 2024
668b775
test: re-add test_csv2cve tests
terriko Jan 11, 2024
e16304c
test: re-enable language scanner tests
terriko Jan 11, 2024
4c22b79
test: re-enable test_sbom tests
terriko Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cve_bin_tool/cvedb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ class CVEDB:
BACKUPCACHEDIR = DISK_LOCATION_BACKUP
LOGGER = LOGGER.getChild("CVEDB")
SOURCES = [
nvd_source.NVD_Source,
curl_source.Curl_Source,
osv_source.OSV_Source,
gad_source.GAD_Source,
nvd_source.NVD_Source, # last to avoid data overwrites
]

INSERT_QUERIES = {
Expand Down
1 change: 0 additions & 1 deletion test/test_csv2cve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@


class TestCSV2CVE:
@pytest.mark.skip(reason="Temporarily disabled -- may need data changes")
@pytest.mark.asyncio
async def test_csv2cve_valid_file(self, caplog):
file_path = join(dirname(__file__), "csv", "triage.csv")
Expand Down
1 change: 0 additions & 1 deletion test/test_exploits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@


class TestExploitScanner:
@pytest.mark.skip(reason="Temporarily disabled -- may need data changes")
@pytest.mark.parametrize(
"check_exploits, exploits_list, product_info, triage_info, expected_result",
(
Expand Down
2 changes: 0 additions & 2 deletions test/test_language_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ def setup_class(cls):
cls.cvedb.get_cvelist_if_stale()
print("Database setup complete.")

@pytest.mark.skip(reason="Temporarily disabled -- may need data changes")
@pytest.mark.parametrize(
"filename, product_list",
(((str(TEST_FILE_PATH / "pom.xml")), ["jmeter", "hamcrest"]),),
Expand Down Expand Up @@ -235,7 +234,6 @@ def test_language_package(self, filename: str, products: set[str]) -> None:
assert p in found_product
assert file_path == filename

@pytest.mark.skip(reason="Temporarily disabled -- may need data changes")
@pytest.mark.parametrize("filename", ((str(TEST_FILE_PATH / "PKG-INFO")),))
def test_python_package(self, filename: str) -> None:
scanner = VersionScanner()
Expand Down
3 changes: 0 additions & 3 deletions test/test_sbom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ def test_invalid_type(self, filename: str, sbom_type: str):
sbom_engine = SBOMManager(filename, sbom_type)
assert sbom_engine.scan_file() == {}

@pytest.mark.skip(reason="Temporarily disabled -- may need data changes")
@pytest.mark.parametrize(
"filename, spdx_parsed_data",
(
Expand All @@ -89,7 +88,6 @@ def test_valid_spdx_file(
for p in spdx_parsed_data:
assert p in scan_result

@pytest.mark.skip(reason="Temporarily disabled -- may need data changes")
@pytest.mark.parametrize(
"filename, cyclonedx_parsed_data",
(
Expand All @@ -107,7 +105,6 @@ def test_valid_cyclonedx_file(
for p in cyclonedx_parsed_data:
assert p in scan_result

@pytest.mark.skip(reason="Temporarily disabled -- may need data changes")
@pytest.mark.parametrize(
"filename, swid_parsed_data",
((str(SBOM_PATH / "swid_test.xml"), PARSED_SBOM_DATA),),
Expand Down