chromium/src
0
Fork 0
Code Activity

Revert "Remove outdated TAG length presubmit error"

Browse Source 
This reverts commit 77e3d6fa3d.

Reason for revert: It's still useful to have a limit here.

Original change's description:
> Remove outdated TAG length presubmit error
>
> The tag length limitation only applies to API <= 25, and Chrome has a min
> API of 26:
> https://source.chromium.org/chromium/chromium/src/+/main:build/config/android/config.gni;l=70?q=min_sdk_version%20lang:gn&ss=chromium.
>
> Change-Id: I5c75e3db16f068d8e5c61f1611b927e81b43db68
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5147980
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Geoff Huang <geoffhuang@google.com>
> Auto-Submit: Geoff Huang <geoffhuang@google.com>
> Cr-Commit-Position: refs/heads/main@{#1240847}

Change-Id: I3de662e88047ebf6e24c7971e02cf6c481cff4f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5160549
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1242138}
This commit is contained in:
Andrew Grieve
2024-01-02 21:24:38 +00:00
committed by Chromium LUCI CQ
parent b21a8fe8a4
commit d3a35d8b6e
2 changed files with 33 additions and 17 deletions

9
PRESUBMIT.py

@ -4287,6 +4287,7 @@ def _CheckAndroidCrLogUsage(input_api, output_api):
files_to_skip=cr_log_check_excluded_paths)
tag_decl_errors = []
tag_length_errors = []
tag_errors = []
tag_with_dot_errors = []
util_log_errors = []
@ -4324,6 +4325,8 @@ def _CheckAndroidCrLogUsage(input_api, output_api):
tag_name = match.group('name') if match else None
if not tag_name:
tag_decl_errors.append(f.LocalPath())
elif len(tag_name) > 20:
tag_length_errors.append(f.LocalPath())
elif '.' in tag_name:
tag_with_dot_errors.append(f.LocalPath())
@ -4336,6 +4339,12 @@ def _CheckAndroidCrLogUsage(input_api, output_api):
'They will be prepended with "cr_" automatically.\n' + REF_MSG,
tag_decl_errors))
if tag_length_errors:
results.append(
output_api.PresubmitError(
'The tag length is restricted by the system to be at most '
'20 characters.\n' + REF_MSG, tag_length_errors))
if tag_errors:
results.append(
output_api.PresubmitPromptWarning(

41
PRESUBMIT_test.py

@ -1719,8 +1719,8 @@ class LogUsageTest(unittest.TestCase):
msgs = PRESUBMIT._CheckAndroidCrLogUsage(
mock_input_api, mock_output_api)
self.assertEqual(4, len(msgs),
'Expected %d items, found %d: %s' % (4, len(msgs), msgs))
self.assertEqual(5, len(msgs),
'Expected %d items, found %d: %s' % (5, len(msgs), msgs))
# Declaration format
nb = len(msgs[0].items)
@ -1729,29 +1729,36 @@ class LogUsageTest(unittest.TestCase):
self.assertTrue('HasNoTagDecl.java' in msgs[0].items)
self.assertTrue('HasIncorrectTagDecl.java' in msgs[0].items)
# Tag must be a variable named TAG
# Tag length
nb = len(msgs[1].items)
self.assertEqual(3, nb,
'Expected %d items, found %d: %s' % (3, nb, msgs[1].items))
self.assertTrue('HasBothLog.java:5' in msgs[1].items)
self.assertTrue('HasInlineTag.java:4' in msgs[1].items)
self.assertTrue('HasInlineTagWithSpace.java:4' in msgs[1].items)
self.assertEqual(2, nb,
'Expected %d items, found %d: %s' % (2, nb, msgs[1].items))
self.assertTrue('HasTooLongTag.java' in msgs[1].items)
self.assertTrue('HasTooLongTagWithNoLogCallsInDiff.java' in msgs[1].items)
# Util Log usage
# Tag must be a variable named TAG
nb = len(msgs[2].items)
self.assertEqual(3, nb,
'Expected %d items, found %d: %s' % (3, nb, msgs[2].items))
self.assertTrue('HasAndroidLog.java:3' in msgs[2].items)
self.assertTrue('HasExplicitUtilLog.java:2' in msgs[2].items)
self.assertTrue('IsInBasePackageButImportsLog.java:4' in msgs[2].items)
self.assertTrue('HasBothLog.java:5' in msgs[2].items)
self.assertTrue('HasInlineTag.java:4' in msgs[2].items)
self.assertTrue('HasInlineTagWithSpace.java:4' in msgs[2].items)
# Tag must not contain
# Util Log usage
nb = len(msgs[3].items)
self.assertEqual(3, nb,
'Expected %d items, found %d: %s' % (2, nb, msgs[3].items))
self.assertTrue('HasDottedTag.java' in msgs[3].items)
self.assertTrue('HasDottedTagPublic.java' in msgs[3].items)
self.assertTrue('HasOldTag.java' in msgs[3].items)
'Expected %d items, found %d: %s' % (3, nb, msgs[3].items))
self.assertTrue('HasAndroidLog.java:3' in msgs[3].items)
self.assertTrue('HasExplicitUtilLog.java:2' in msgs[3].items)
self.assertTrue('IsInBasePackageButImportsLog.java:4' in msgs[3].items)
# Tag must not contain
nb = len(msgs[4].items)
self.assertEqual(3, nb,
'Expected %d items, found %d: %s' % (2, nb, msgs[4].items))
self.assertTrue('HasDottedTag.java' in msgs[4].items)
self.assertTrue('HasDottedTagPublic.java' in msgs[4].items)
self.assertTrue('HasOldTag.java' in msgs[4].items)
class GoogleAnswerUrlFormatTest(unittest.TestCase):