Merge pull request Ericsson#4013 from Szelethus/ignore_detection_stat…

…us_for_tags

[cmd][diff] Ignore detection status for tags

web/client/codechecker_client/cmd_line_client.py

@@ -995,6 +995,27 @@ def get_diff_remote_runs(
         ttypes.SortType.FILENAME,
         ttypes.Order.ASC))]
 
+    # Generally speaking, we only compare outstanding reports in both the
+    # baseline and newline analyses, so it wouldn't make sense to show reports
+    # whose detection status indicates otherwise. However, for tags, we check
+    # whether a report is outstanding at the time of the tag, so in the context
+    # of that tag, a resolved report may actually be outstanding, so we clear
+    # the detection status filter.
+    # TODO: We don't support diffs with timestamps on the cmdline, but we
+    # should do this for them as well.
+    if base_run_tags or new_run_tags:
+        # If the value is not the default, lets warn the user that we overwrote
+        # it.
+        default_detection_status = [ttypes.DetectionStatus.NEW,
+                                    ttypes.DetectionStatus.REOPENED,
+                                    ttypes.DetectionStatus.UNRESOLVED]
+        if report_filter.detectionStatus != default_detection_status and \
+           report_filter.detectionStatus != []:
+            LOG.warning("--detection-status is ignored when comparing tags, "
+                        "showing reports regardless of detection status.")
+
+        report_filter.detectionStatus = []
+
     all_results = get_run_results(
         client, base_ids, constants.MAX_QUERY_SIZE, 0, sort_mode,
         report_filter, cmp_data, True)

web/tests/functional/diff_cmdline/test_diff_cmdline.py

@@ -17,11 +17,11 @@
 import unittest
 
 from codechecker_api.codeCheckerDBAccess_v6.ttypes import \
-        ReviewStatus, DiffType, ReportFilter
+        ReviewStatus, DiffType, ReportFilter, DetectionStatus
 
 from codechecker_client.cmd_line_client import \
     get_diff_local_dirs, get_diff_remote_run_local_dir, \
-    get_diff_local_dir_remote_run, get_diff_remote_runs
+    get_diff_local_dir_remote_run, get_diff_remote_runs, init_logger
 
 from libtest import codechecker, env
 from libtest.thrift_client_to_db import get_all_run_results
@@ -64,6 +64,8 @@ def setup_class(self):
 
         env.export_test_cfg(TEST_WORKSPACE, test_config)
 
+        init_logger(None, None)
+
     def teardown_class(self):
         """Clean up after the test."""
 
@@ -636,7 +638,7 @@ def test_remoteTag_remoteTag_different(self):
 
         report_filter = ReportFilter()
         report_filter.reviewStatus = []
-        report_filter.detection_status = []
+        report_filter.detectionStatus = []
 
         def get_run_diff_count(diff_type: DiffType):
             reports, _, _ = get_diff_remote_runs(
@@ -648,6 +650,16 @@ def get_run_diff_count(diff_type: DiffType):
         self.assertEqual(get_run_diff_count(DiffType.RESOLVED), 1)
         self.assertEqual(get_run_diff_count(DiffType.UNRESOLVED), 0)
 
+        # This is the default value for --review-status, but for tags, we
+        # should ignore it.
+        report_filter.detectionStatus = [DetectionStatus.NEW,
+                                         DetectionStatus.REOPENED,
+                                         DetectionStatus.UNRESOLVED]
+
+        self.assertEqual(get_run_diff_count(DiffType.NEW), 1)
+        self.assertEqual(get_run_diff_count(DiffType.RESOLVED), 1)
+        self.assertEqual(get_run_diff_count(DiffType.UNRESOLVED), 0)
+
         def get_run_diff_count_reverse(diff_type: DiffType):
             reports, _, _ = get_diff_remote_runs(
                     self._cc_client, report_filter, diff_type, [],