From 26bfecdd070cfdc7b0053fcfe7ca0a3cbb40ccb5 Mon Sep 17 00:00:00 2001 From: Takuto Ikuta Date: Fri, 3 Dec 2021 18:37:39 +0000 Subject: [PATCH] include filename in LUCI config validation Fixed: 1254615 Change-Id: Ic6d5350c7a89a597c1126ec05235a3e63eb2ad09 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3312231 Auto-Submit: Takuto Ikuta Commit-Queue: Anthony Polito Reviewed-by: Anthony Polito --- presubmit_canned_checks.py | 4 +++- tests/presubmit_unittest.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index c27f1f557..433e35eb2 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -1739,7 +1739,9 @@ def CheckChangedLUCIConfigs(input_api, output_api): out_f = output_api.PresubmitError else: out_f = output_api.PresubmitNotifyResult - outputs.append(out_f('Config validation: %s' % msg['text'])) + outputs.append( + out_f('Config validation for %s: %s' % ([str(obj['path']) + for obj in f], msg['text']))) return outputs diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py index a0b101c19..9a4c8e3a0 100755 --- a/tests/presubmit_unittest.py +++ b/tests/presubmit_unittest.py @@ -2019,6 +2019,8 @@ class CannedChecksUnittest(PresubmitTestsBase): results = presubmit_canned_checks.CheckChangedLUCIConfigs( input_api, presubmit.OutputApi) self.assertEqual(len(results), 1) + self.assertEqual(results[0].json_format()['message'], + "Config validation for ['foo.cfg', 'bar.cfg']: deadbeef") def testCannedCheckChangeHasNoTabs(self): self.ContentTest(presubmit_canned_checks.CheckChangeHasNoTabs,