Docserver overhaul: Gitiles away from me.

chrome/common/extensions/docs/server2/PRESUBMIT.py

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 047dee36296172b80d07e4d58cad84bd920c7f74..c64d416307317d540c79af1c8d7510c1cf908370 100644
--- a/chrome/common/extensions/docs/server2/PRESUBMIT.py
+++ b/chrome/common/extensions/docs/server2/PRESUBMIT.py
@@ -15,8 +15,9 @@ import sys
 
 WHITELIST = [ r'.+_test.py$' ]
 # The integration tests are selectively run from the PRESUBMIT in
-# chrome/common/extensions.
-BLACKLIST = [ r'integration_test.py$' ]
+# chrome/common/extensions. Github filesystem support is currently
+# disabled.
+BLACKLIST = [ r'integration_test.py$', r'.*github.*_test.py$' ]
 
 def _BuildServer(input_api):
   try:
@@ -26,14 +27,6 @@ def _BuildServer(input_api):
   finally:
     sys.path.pop(0)
 
-def _ImportAppYamlHelper(input_api):
-  try:
-    sys.path.insert(0, input_api.PresubmitLocalPath())
-    from app_yaml_helper import AppYamlHelper
-    return AppYamlHelper
-  finally:
-    sys.path.pop(0)
-
 def _WarnIfAppYamlHasntChanged(input_api, output_api):
   app_yaml_path = os.path.join(input_api.PresubmitLocalPath(), 'app.yaml')
   if app_yaml_path in input_api.AbsoluteLocalPaths():
@@ -53,7 +46,6 @@ Yes? Bump the middle version and zero out the end version, i.e. 2-5-2 -> 2-6-0.
      THIS WILL CAUSE THE CURRENTLY RUNNING SERVER TO STOP UPDATING.
      PUSH THE NEW VERSION ASAP.
 No? Continue.
-
 Q: Is this a non-trivial change to the server?
 Yes? Bump the end version.
      Unlike above, the server will *not* stop updating.
@@ -64,25 +56,6 @@ 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')

[Ken Rockot(use gerrit already), 2015/05/26 00:26:22]

There is no more cron.yaml, so...

-  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)
   # For now, print any lint errors. When these have been eliminated,
@@ -94,7 +67,6 @@ def _RunPresubmit(input_api, output_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)
   )