From 0cb679e4aa560876cb29fffa655ef58f9e21f5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20Umann?= Date: Tue, 27 Jun 2023 13:57:36 +0200 Subject: [PATCH] [cmd] Fix a bug where src code suppression was ignored for baseline local-local diffs Pretty much what it says on the tin. --- web/client/codechecker_client/cmd_line_client.py | 9 ++++++--- .../functional/diff_cmdline/test_diff_cmdline.py | 12 ++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/web/client/codechecker_client/cmd_line_client.py b/web/client/codechecker_client/cmd_line_client.py index 9cede31eea..a14aeecb89 100644 --- 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 index 836cb095bb..2dd934e666 100644 --- 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) # ===-----------------------------------------------------------------=== #