Merge pull request #3944 from Szelethus/fix_local_local_diff_src_code…

…_suppression Fix local local diff src code suppression
Ericsson · Jul 7, 2023 · 78f6863 · 78f6863
2 parents 310311e + 0cb679e
commit 78f6863
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/web/client/codechecker_client/cmd_line_client.py b/web/client/codechecker_client/cmd_line_client.py
@@ -1025,13 +1025,16 @@ def get_diff_local_dirs(
     filtered_report_hashes = []
 
     context = webserver_context.get_context()
+    statuses_str = [ttypes.ReviewStatus._VALUES_TO_NAMES[x].lower()
+                    for x in report_filter.reviewStatus]
+
     base_results = get_report_dir_results(
         report_dirs, report_filter, context.checker_labels)
+    base_results = [res for res in base_results
+                    if res.check_source_code_comments(statuses_str)]
+
     new_results = get_report_dir_results(
         new_report_dirs, report_filter, context.checker_labels)
-
-    statuses_str = [ttypes.ReviewStatus._VALUES_TO_NAMES[x].lower()
-                    for x in report_filter.reviewStatus]
     new_results = [res for res in new_results
                    if res.check_source_code_comments(statuses_str)]
 

diff --git a/web/tests/functional/diff_cmdline/test_diff_cmdline.py b/web/tests/functional/diff_cmdline/test_diff_cmdline.py
@@ -276,15 +276,9 @@ def get_run_diff_count(diff_type: DiffType):
                     report_filter, diff_type, [dir1], [], [dir2], [])
             return len(reports)
 
-        # FIXME: The report turned from source code suppressed to no longer
-        # suppressed, so it should be in this set.
-        self.assertEqual(get_run_diff_count(DiffType.NEW), 0)
-
-        # No reports disappeared.
+        self.assertEqual(get_run_diff_count(DiffType.NEW), 1)
         self.assertEqual(get_run_diff_count(DiffType.RESOLVED), 0)
-
-        # FIXME: The report should not appear here.
-        self.assertEqual(get_run_diff_count(DiffType.UNRESOLVED), 1)
+        self.assertEqual(get_run_diff_count(DiffType.UNRESOLVED), 0)
 
         def get_run_diff_count_reverse(diff_type: DiffType):
             report_filter = ReportFilter()
@@ -295,9 +289,7 @@ def get_run_diff_count_reverse(diff_type: DiffType):
             return len(reports)
 
         self.assertEqual(get_run_diff_count_reverse(DiffType.NEW), 0)
-
         self.assertEqual(get_run_diff_count_reverse(DiffType.RESOLVED), 1)
-
         self.assertEqual(get_run_diff_count_reverse(DiffType.UNRESOLVED), 0)
 
     # ===-----------------------------------------------------------------=== #