@@ -37,19 +37,19 @@ def test_close_old_same_engagement(self):
37
37
"scan_type" : scan_type ,
38
38
}
39
39
# Import first test
40
- with (get_unit_tests_scans_path ("acunetix" ) / "many_findings.xml" ).open ("r+" , encoding = "utf-8" ) as many_findings_scan :
40
+ with (get_unit_tests_scans_path ("acunetix" ) / "many_findings.xml" ).open (encoding = "utf-8" ) as many_findings_scan :
41
41
importer = DefaultImporter (close_old_findings = False , ** import_options )
42
42
_ , _ , len_new_findings , len_closed_findings , _ , _ , _ = importer .process_scan (many_findings_scan )
43
43
self .assertEqual (4 , len_new_findings )
44
44
self .assertEqual (0 , len_closed_findings )
45
45
# Import same test, should close no findings
46
- with (get_unit_tests_scans_path ("acunetix" ) / "many_findings.xml" ).open ("r+" , encoding = "utf-8" ) as many_findings_scan :
46
+ with (get_unit_tests_scans_path ("acunetix" ) / "many_findings.xml" ).open (encoding = "utf-8" ) as many_findings_scan :
47
47
importer = DefaultImporter (close_old_findings = True , ** import_options )
48
48
_ , _ , len_new_findings , len_closed_findings , _ , _ , _ = importer .process_scan (many_findings_scan )
49
49
self .assertEqual (4 , len_new_findings )
50
50
self .assertEqual (0 , len_closed_findings )
51
51
# Import test with only one finding. Remaining findings should close
52
- with (get_unit_tests_scans_path ("acunetix" ) / "one_finding.xml" ).open ("r+" , encoding = "utf-8" ) as single_finding_scan :
52
+ with (get_unit_tests_scans_path ("acunetix" ) / "one_finding.xml" ).open (encoding = "utf-8" ) as single_finding_scan :
53
53
importer = DefaultImporter (close_old_findings = True , ** import_options )
54
54
_ , _ , len_new_findings , len_closed_findings , _ , _ , _ = importer .process_scan (single_finding_scan )
55
55
self .assertEqual (1 , len_new_findings )
@@ -95,19 +95,19 @@ def test_close_old_same_product_scan(self):
95
95
"scan_type" : scan_type ,
96
96
}
97
97
# Import first test
98
- with (get_unit_tests_scans_path ("acunetix" ) / "many_findings.xml" ).open ("r+" , encoding = "utf-8" ) as many_findings_scan :
98
+ with (get_unit_tests_scans_path ("acunetix" ) / "many_findings.xml" ).open (encoding = "utf-8" ) as many_findings_scan :
99
99
importer = DefaultImporter (engagement = engagement1 , close_old_findings = False , ** import_options )
100
100
_ , _ , len_new_findings , len_closed_findings , _ , _ , _ = importer .process_scan (many_findings_scan )
101
101
self .assertEqual (4 , len_new_findings )
102
102
self .assertEqual (0 , len_closed_findings )
103
103
# Import same test, should close no findings
104
- with (get_unit_tests_scans_path ("acunetix" ) / "many_findings.xml" ).open ("r+" , encoding = "utf-8" ) as many_findings_scan :
104
+ with (get_unit_tests_scans_path ("acunetix" ) / "many_findings.xml" ).open (encoding = "utf-8" ) as many_findings_scan :
105
105
importer = DefaultImporter (engagement = engagement2 , close_old_findings = True , ** import_options )
106
106
_ , _ , len_new_findings , len_closed_findings , _ , _ , _ = importer .process_scan (many_findings_scan )
107
107
self .assertEqual (4 , len_new_findings )
108
108
self .assertEqual (0 , len_closed_findings )
109
109
# Import test with only one finding. Remaining findings should close
110
- with (get_unit_tests_scans_path ("acunetix" ) / "one_finding.xml" ).open ("r+" , encoding = "utf-8" ) as single_finding_scan :
110
+ with (get_unit_tests_scans_path ("acunetix" ) / "one_finding.xml" ).open (encoding = "utf-8" ) as single_finding_scan :
111
111
importer = DefaultImporter (engagement = engagement3 , close_old_findings = True , ** import_options )
112
112
_ , _ , len_new_findings , len_closed_findings , _ , _ , _ = importer .process_scan (single_finding_scan )
113
113
self .assertEqual (1 , len_new_findings )
@@ -153,20 +153,20 @@ def test_close_old_same_product_scan_matching_with_unique_id_from_tool(self):
153
153
"scan_type" : scan_type ,
154
154
}
155
155
# Import first test
156
- with (get_unit_tests_scans_path ("semgrep" ) / "close_old_findings_report_line31.json" ).open ("r+" , encoding = "utf-8" ) as many_findings_scan :
156
+ with (get_unit_tests_scans_path ("semgrep" ) / "close_old_findings_report_line31.json" ).open (encoding = "utf-8" ) as many_findings_scan :
157
157
importer = DefaultImporter (engagement = engagement1 , close_old_findings = False , ** import_options )
158
158
_ , _ , len_new_findings , len_closed_findings , _ , _ , _ = importer .process_scan (many_findings_scan )
159
159
self .assertEqual (1 , len_new_findings )
160
160
self .assertEqual (0 , len_closed_findings )
161
161
# Import separate report with different line number. Before this change, the legacy dedupe algorithm would calculate a different
162
162
# hash code and close of the findings. Now that we are matching on unique ID from tool, we should no close anything, and create one
163
- with (get_unit_tests_scans_path ("semgrep" ) / "close_old_findings_report_second_run_line24.json" ).open ("r+" , encoding = "utf-8" ) as many_findings_scan :
163
+ with (get_unit_tests_scans_path ("semgrep" ) / "close_old_findings_report_second_run_line24.json" ).open (encoding = "utf-8" ) as many_findings_scan :
164
164
importer = DefaultImporter (engagement = engagement2 , close_old_findings = True , ** import_options )
165
165
_ , _ , len_new_findings , len_closed_findings , _ , _ , _ = importer .process_scan (many_findings_scan )
166
166
self .assertEqual (1 , len_new_findings )
167
167
self .assertEqual (0 , len_closed_findings )
168
168
# This scan has a different unique ID from tool, so we should have one new finding, and one closed finding
169
- with (get_unit_tests_scans_path ("semgrep" ) / "close_old_findings_report_third_run_different_unique_id.json" ).open ("r+" , encoding = "utf-8" ) as many_findings_scan :
169
+ with (get_unit_tests_scans_path ("semgrep" ) / "close_old_findings_report_third_run_different_unique_id.json" ).open (encoding = "utf-8" ) as many_findings_scan :
170
170
importer = DefaultImporter (engagement = engagement3 , close_old_findings = True , ** import_options )
171
171
_ , _ , len_new_findings , len_closed_findings , _ , _ , _ = importer .process_scan (many_findings_scan )
172
172
self .assertEqual (1 , len_new_findings )
0 commit comments