Index: chrome/common/extensions/docs/server2/PRESUBMIT.py |
diff --git a/chrome/common/extensions/docs/server2/PRESUBMIT.py b/chrome/common/extensions/docs/server2/PRESUBMIT.py |
index 7ac6d9aea5ff30b50d406f82ed800719eb9049ab..745411ae5988513af21e305b5334b553c627e7ca 100644 |
--- a/chrome/common/extensions/docs/server2/PRESUBMIT.py |
+++ b/chrome/common/extensions/docs/server2/PRESUBMIT.py |
@@ -64,30 +64,10 @@ Yes? Ok fine. Ignore this warning. |
No? I guess this presubmit check doesn't work. |
''')] |
-def _CheckYamlConsistency(input_api, output_api): |
- app_yaml_path = os.path.join(input_api.PresubmitLocalPath(), 'app.yaml') |
- cron_yaml_path = os.path.join(input_api.PresubmitLocalPath(), 'cron.yaml') |
- if not (app_yaml_path in input_api.AbsoluteLocalPaths() or |
- cron_yaml_path in input_api.AbsoluteLocalPaths()): |
- return [] |
- |
- AppYamlHelper = _ImportAppYamlHelper(input_api) |
- app_yaml_version = AppYamlHelper.ExtractVersion( |
- input_api.ReadFile(app_yaml_path)) |
- cron_yaml_version = AppYamlHelper.ExtractVersion( |
- input_api.ReadFile(cron_yaml_path), key='target') |
- |
- if app_yaml_version == cron_yaml_version: |
- return [] |
- return [output_api.PresubmitError( |
- 'Versions of app.yaml (%s) and cron.yaml (%s) must match' % ( |
- app_yaml_version, cron_yaml_version))] |
- |
def _RunPresubmit(input_api, output_api): |
_BuildServer(input_api) |
return ( |
_WarnIfAppYamlHasntChanged(input_api, output_api) + |
- _CheckYamlConsistency(input_api, output_api) + |
input_api.canned_checks.RunUnitTestsInDirectory( |
input_api, output_api, '.', whitelist=WHITELIST, blacklist=BLACKLIST) |
) |