|
10 | 10 | import types |
11 | 11 | from unittest.mock import patch |
12 | 12 |
|
13 | | -from vulnerabilities.pipelines.v2_importers.apache_tomcat_importer import ( |
14 | | - ApacheTomcatImporterPipeline, |
15 | | - parse_tomcat_security, |
16 | | - TomcatAdvisoryData, |
17 | | -) |
18 | | -from vulnerabilities.importer import AdvisoryData |
19 | | -from vulnerabilities.importer import AffectedPackageV2 |
20 | 13 | from packageurl import PackageURL |
21 | 14 | from univers.version_range import ApacheVersionRange |
22 | 15 | from univers.version_range import MavenVersionRange |
23 | 16 |
|
| 17 | +from vulnerabilities.importer import AdvisoryData |
| 18 | +from vulnerabilities.importer import AffectedPackageV2 |
| 19 | +from vulnerabilities.pipelines.v2_importers.apache_tomcat_importer import ( |
| 20 | + ApacheTomcatImporterPipeline, |
| 21 | +) |
| 22 | +from vulnerabilities.pipelines.v2_importers.apache_tomcat_importer import TomcatAdvisoryData |
| 23 | +from vulnerabilities.pipelines.v2_importers.apache_tomcat_importer import parse_tomcat_security |
24 | 24 |
|
25 | 25 | TOMCAT_SECURITY_HTML = """ |
26 | 26 | <html> |
|
53 | 53 | """ |
54 | 54 |
|
55 | 55 |
|
56 | | - |
57 | 56 | def test_parse_tomcat_security_multiple_fixed_sections_same_cve(): |
58 | 57 | advisories = parse_tomcat_security(TOMCAT_SECURITY_HTML) |
59 | 58 |
|
@@ -129,15 +128,11 @@ def test_apache_and_maven_version_ranges_created(mock_get): |
129 | 128 | advisory = list(pipeline.collect_advisories())[0] |
130 | 129 |
|
131 | 130 | apache_ranges = [ |
132 | | - p.affected_version_range |
133 | | - for p in advisory.affected_packages |
134 | | - if p.package.type == "apache" |
| 131 | + p.affected_version_range for p in advisory.affected_packages if p.package.type == "apache" |
135 | 132 | ] |
136 | 133 |
|
137 | 134 | maven_ranges = [ |
138 | | - p.affected_version_range |
139 | | - for p in advisory.affected_packages |
140 | | - if p.package.type == "maven" |
| 135 | + p.affected_version_range for p in advisory.affected_packages if p.package.type == "maven" |
141 | 136 | ] |
142 | 137 |
|
143 | 138 | assert len(apache_ranges) == 2 |
|
0 commit comments