|
10 | 10 | from datetime import datetime |
11 | 11 | from datetime import timedelta |
12 | 12 |
|
| 13 | +import pytest |
13 | 14 | from django.test import TestCase |
14 | 15 | from fetchcode.package_versions import PackageVersion |
15 | 16 | from packageurl import PackageURL |
16 | | -import pytest |
17 | 17 | from univers.version_constraint import VersionConstraint |
18 | 18 | from univers.version_range import GemVersionRange |
19 | 19 | from univers.version_range import VersionRange |
|
25 | 25 | from vulnerabilities.importer import PackageCommitPatchData |
26 | 26 | from vulnerabilities.importer import PatchData |
27 | 27 | from vulnerabilities.importer import VulnerabilitySeverity |
28 | | -from vulnerabilities.models import AdvisoryAlias, AdvisoryV2 |
| 28 | +from vulnerabilities.models import AdvisoryAlias |
| 29 | +from vulnerabilities.models import AdvisoryV2 |
29 | 30 | from vulnerabilities.pipelines import insert_advisory_v2 |
30 | 31 | from vulnerabilities.references import XsaReferenceV2 |
31 | 32 | from vulnerabilities.references import ZbxReferenceV2 |
32 | 33 | from vulnerabilities.tests.pipelines import TestLogger |
33 | | -from vulnerabilities.utils import AffectedPackage, relate_aliases_with_advisories |
| 34 | +from vulnerabilities.utils import AffectedPackage |
34 | 35 | from vulnerabilities.utils import get_item |
35 | 36 | from vulnerabilities.utils import get_severity_range |
36 | 37 | from vulnerabilities.utils import nearest_patched_package |
| 38 | +from vulnerabilities.utils import relate_aliases_with_advisories |
37 | 39 | from vulnerabilities.utils import resolve_version_range |
38 | 40 | from vulnerabilities.utils import split_markdown_front_matter |
39 | 41 |
|
@@ -332,9 +334,7 @@ def test_handles_mixed_aliases_and_advisory_ids(): |
332 | 334 | alias = AdvisoryAlias.objects.create(alias="CVE-2025-1") |
333 | 335 | alias.advisories.add(alias_adv) |
334 | 336 |
|
335 | | - result = relate_aliases_with_advisories( |
336 | | - ["CVE-2025-1", "GHSA-2"] |
337 | | - ) |
| 337 | + result = relate_aliases_with_advisories(["CVE-2025-1", "GHSA-2"]) |
338 | 338 |
|
339 | 339 | assert result == {alias_adv, advisory_id_adv} |
340 | 340 |
|
@@ -411,8 +411,6 @@ def test_deduplicates_results(): |
411 | 411 | alias1.advisories.add(advisory) |
412 | 412 | alias2.advisories.add(advisory) |
413 | 413 |
|
414 | | - result = relate_aliases_with_advisories( |
415 | | - ["CVE-1", "CVE-2"] |
416 | | - ) |
| 414 | + result = relate_aliases_with_advisories(["CVE-1", "CVE-2"]) |
417 | 415 |
|
418 | 416 | assert result == {advisory} |
0 commit comments