Skip Android SDK extras version check on bots

build/check_sdk_extras_version.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Checks the status of an Android SDK package.
 
 Verifies the given package has been installed from the Android SDK Manager and
 that its version is at least the minimum version required by the project
 configuration.
@@ skipping 44 matching lines @@
   parser.add_argument('--package-location',
                       help='path to the package\'s expected install location.',
                       metavar='DIR')
   parser.add_argument('--stamp',
                       help=('if specified, a stamp file will be created at the '
                             'provided location.'),
                       metavar='FILE')
 
   args = parser.parse_args()
 
-  minimum_version = GetRequiredMinimumVersion(args.package_id)
-  CheckPackageVersion(args.package_id, args.package_location, minimum_version)
+  if not ShouldSkipVersionCheck():
+    minimum_version = GetRequiredMinimumVersion(args.package_id)
+    CheckPackageVersion(args.package_id, args.package_location, minimum_version)
 
   # Create the stamp file.
   if args.stamp:
     with open(args.stamp, 'a'):
       os.utime(args.stamp, None)
 
   sys.exit(0)
 
 def ExitError(msg):
   sys.exit(colorama.Fore.MAGENTA + colorama.Style.BRIGHT + msg +
-           colorama.Fore.RESET)
+           colorama.Style.RESET_ALL)

[dgn, 2015/07/09 15:30:10]

Only the color was previously reset, the rest of the text used to remain bright.

 
 
 def GetRequiredMinimumVersion(package_id):
   with open(SDK_EXTRAS_JSON_FILE, 'r') as json_file:
     packages = json.load(json_file)
 
   for package in packages:
     if package['package_id'] == package_id:
       return int(package['version'].split('.')[0])
 
@@ skipping 24 matching lines @@
     pkg_version = int(match.group('version'))
     if pkg_version < minimum_version:
       ExitError(UPDATE_NEEDED_MSG.format(
         package_id=pkg_id,
         minimum_version=minimum_version,
         actual_version=pkg_version,
         script=UDPATE_SCRIPT_PATH))
 
   # Everything looks ok, print nothing.
 
+def ShouldSkipVersionCheck():
+  '''
+  Bots should not run the version check, since they download the sdk extras
+  in a different way.
+  '''
+  return bool(os.environ.get('CHROME_HEADLESS'))
 
 if __name__ == '__main__':
   main()