Commit e6d6e338 authored by Edward Lesmes's avatar Edward Lesmes Committed by Commit Bot

PRESUBMIT.py: Replace checkteamtags with DIR_METADATA checks.

checkteamtags is no longer necessary.
- Add a check to validate DIR_METADATA files.
  This obviates the need fo checkteamtags, as `dirmd` validates metadata in
  OWNERS files, and we no longer need to enforce a unique team email for all
  (component, OS) pair.
- Add a check to enforce that OWNERS files contain no metadata if a
  DIR_METADATA file is present in the same directory.

Bug: 1102997
Change-Id: I661f7a1958824e7d20642d65534c2502d1a050e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317838Reviewed-by: default avatarNodir Turakulov <nodir@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791884}
parent 7a29a1fc
...@@ -2156,28 +2156,6 @@ def _CheckFilePermissions(input_api, output_api): ...@@ -2156,28 +2156,6 @@ def _CheckFilePermissions(input_api, output_api):
long_text=error.output)] long_text=error.output)]
def _CheckTeamTags(input_api, output_api):
"""Checks that OWNERS files have consistent TEAM and COMPONENT tags."""
checkteamtags_tool = input_api.os_path.join(
input_api.PresubmitLocalPath(),
'tools', 'checkteamtags', 'checkteamtags.py')
args = [input_api.python_executable, checkteamtags_tool,
'--root', input_api.change.RepositoryRoot()]
files = [f.LocalPath() for f in input_api.AffectedFiles(include_deletes=False)
if input_api.os_path.basename(f.AbsoluteLocalPath()).upper() ==
'OWNERS']
try:
if files:
warnings = input_api.subprocess.check_output(args + files).splitlines()
if warnings:
return [output_api.PresubmitPromptWarning(warnings[0], warnings[1:])]
return []
except input_api.subprocess.CalledProcessError as error:
return [output_api.PresubmitError(
'checkteamtags.py failed:',
long_text=error.output)]
def _CheckNoAuraWindowPropertyHInHeaders(input_api, output_api): def _CheckNoAuraWindowPropertyHInHeaders(input_api, output_api):
"""Makes sure we don't include ui/aura/window_property.h """Makes sure we don't include ui/aura/window_property.h
in header files. in header files.
...@@ -4419,7 +4397,11 @@ def _CommonChecks(input_api, output_api): ...@@ -4419,7 +4397,11 @@ def _CommonChecks(input_api, output_api):
results.extend(_CheckNoTrinaryTrueFalse(input_api, output_api)) results.extend(_CheckNoTrinaryTrueFalse(input_api, output_api))
results.extend(_CheckUnwantedDependencies(input_api, output_api)) results.extend(_CheckUnwantedDependencies(input_api, output_api))
results.extend(_CheckFilePermissions(input_api, output_api)) results.extend(_CheckFilePermissions(input_api, output_api))
results.extend(_CheckTeamTags(input_api, output_api)) results.extend(
input_api.canned_checks.CheckDirMetadataFormat(input_api, output_api))
results.extend(
input_api.canned_checks.CheckOwnersDirMetadataExclusive(
input_api, output_api))
results.extend(_CheckNoAuraWindowPropertyHInHeaders(input_api, output_api)) results.extend(_CheckNoAuraWindowPropertyHInHeaders(input_api, output_api))
results.extend(_CheckForVersionControlConflicts(input_api, output_api)) results.extend(_CheckForVersionControlConflicts(input_api, output_api))
results.extend(_CheckPatchFiles(input_api, output_api)) results.extend(_CheckPatchFiles(input_api, output_api))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment