Cause mini_installer tests to noop on component builds.

chrome/test/mini_installer/test_installer.py

 # Copyright 2013 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.
 
 """This script tests the installer with test cases specified in the config file.
 
 For each test case, it checks that the machine states after the execution of
 each command match the expected machine states. For more details, take a look at
 the design documentation at http://goo.gl/Q0rGM6
 """
@@ skipping 224 matching lines @@
   """
   suite = unittest.TestSuite()
   variable_expander = VariableExpander(mini_installer_path)
   RunCleanCommand(force_clean, variable_expander)
   for test in config.tests:
     suite.addTest(InstallerTest(test, config, variable_expander))
   result = unittest.TextTestRunner(verbosity=2).run(suite)
   return result.wasSuccessful()
 
 
+def IsComponentBuild(mini_installer_path):
+  """ Invokes the mini_installer asking whether it is a component build.
+
+  Args:
+    mini_installer_path: The path to mini_installer.exe.
+
+  Returns:
+    True if the mini_installer is a component build, False otherwise.
+  """
+  query_command = mini_installer_path + ' --query-component-build'
+  script_dir = os.path.dirname(os.path.abspath(__file__))
+  exit_status = subprocess.call(query_command, shell=True, cwd=script_dir)
+  return exit_status != 0
+
+
 def main():
   usage = 'usage: %prog [options] config_filename'
   parser = optparse.OptionParser(usage, description='Test the installer.')
   parser.add_option('--build-dir', default='out',
                     help='Path to main build directory (the parent of the '
                          'Release or Debug directory)')
   parser.add_option('--target', default='Release',
                     help='Build target (Release or Debug)')
   parser.add_option('--force-clean', action='store_true', dest='force_clean',
                     default=False, help='Force cleaning existing installations')
   options, args = parser.parse_args()
   if len(args) != 1:
     parser.error('Incorrect number of arguments.')
   config_filename = args[0]
 
   mini_installer_path = os.path.join(options.build_dir, options.target,
                                      'mini_installer.exe')
   assert os.path.exists(mini_installer_path), ('Could not find file %s' %
                                                mini_installer_path)
+
+  # Set the env var used by mini_installer.exe to decide to not show UI.
+  os.environ['MINI_INSTALLER_TEST'] = '1'
+  if IsComponentBuild(mini_installer_path):
+    print ('Component build is currently unsupported by the mini_installer: '
+           'http://crbug.com/377839')
+    return 0

[gab, 2014/06/06 16:08:11]

Since we return here why do we also need logic via an environment variable to
now show UI in component mini_installer.exe's? Seems mini_installer.exe will
never be ran in that mode (and even if it was, it's wrong to continue).

[robertshield, 2014/06/06 17:19:21]

IsComponentBuild calls mini_installer.

[gab, 2014/06/06 17:25:03]

I see, but couldn't the early return for the query-component-build be done
before the UI prompt? Seems weird to let the UI prompt fall through only to
reach another early return...

[robertshield, 2014/06/06 17:49:06]

Sure, that would make mini_installer.cc a bit messier imo, but it's roughly
equivalent and this is temporary anyway, so patches are welcome :-)

[gab, 2014/06/10 18:43:43]

"temporary" ;-).

Are the mini_installer_tests back on the try bots?

+
   config = ParseConfigFile(config_filename)
   if not RunTests(mini_installer_path, config, options.force_clean):
     return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())