Commit aea36939 authored by Dirk Pranke's avatar Dirk Pranke Committed by Commit Bot

Revert "Reland "PRESUBMIT.py: Replace checkteamtags with DIR_METADATA checks.""

This reverts commit 474b44df.

Reason for revert: Whoops. Reverting due to the prod freeze.

Original change's description:
> Reland "PRESUBMIT.py: Replace checkteamtags with DIR_METADATA checks."
> 
> This is a reland of e6d6e338
> 
> CheckDirMetadataFormat returns a list of input_api.Command objects,
> which are not derived from output_api.PresubmitResult.
> 
> Fixed by running it using input_api.RunTests.
> 
> Original change's description:
> > 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/+/2317838
> > Reviewed-by: Nodir Turakulov <nodir@chromium.org>
> > Reviewed-by: Dirk Pranke <dpranke@google.com>
> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#791884}
> 
> Bug: 1102997
> Change-Id: Iff7d2569ee4e9a5a66773dba47e2de8e3c8f9b82
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321550
> Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
> Commit-Queue: Dirk Pranke <dpranke@google.com>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Reviewed-by: Nodir Turakulov <nodir@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#792486}

TBR=dpranke@google.com,nodir@chromium.org,ehmaldonado@chromium.org

Change-Id: I6641555670408ef276296b927a9b8f925e5335a3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1102997
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324556Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#792487}
parent 474b44df
...@@ -2163,6 +2163,28 @@ def _CheckFilePermissions(input_api, output_api): ...@@ -2163,6 +2163,28 @@ 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.
...@@ -4404,6 +4426,7 @@ def _CommonChecks(input_api, output_api): ...@@ -4404,6 +4426,7 @@ 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(_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))
...@@ -4449,15 +4472,6 @@ def _CommonChecks(input_api, output_api): ...@@ -4449,15 +4472,6 @@ def _CommonChecks(input_api, output_api):
results.extend(_CheckPythonDevilInit(input_api, output_api)) results.extend(_CheckPythonDevilInit(input_api, output_api))
results.extend(_CheckStableMojomChanges(input_api, output_api)) results.extend(_CheckStableMojomChanges(input_api, output_api))
dirmd_bin = input_api.os_path.join(
input_api.PresubmitLocalPath(), 'third_party', 'depot_tools', 'dirmd')
results.extend(input_api.RunTests(
input_api.canned_checks.CheckDirMetadataFormat(
input_api, output_api, dirmd_bin)))
results.extend(
input_api.canned_checks.CheckOwnersDirMetadataExclusive(
input_api, output_api))
for f in input_api.AffectedFiles(): for f in input_api.AffectedFiles():
path, name = input_api.os_path.split(f.LocalPath()) path, name = input_api.os_path.split(f.LocalPath())
if name == 'PRESUBMIT.py': if name == 'PRESUBMIT.py':
......
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