Clean the machine before running commands in the mini_installer test framework.

chrome/test/mini_installer/uninstall_chrome.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.
 
 """Uninstalls Chrome.
 
 This script reads the uninstall command from registry, calls it, and verifies
 the output status code.
 """
 
 import _winreg
 import optparse
 import subprocess
 import sys
 
 
 def main():
   parser = optparse.OptionParser(description='Uninstall Chrome.')
   parser.add_option('--system-level', action='store_true', dest='system_level',
                     default=False, help='Uninstall Chrome at system level.')
   parser.add_option('--chrome-long-name', default='Google Chrome',
                     help='Google Chrome or Chromium)')
+  parser.add_option('--silent', action='store_true', dest='silent',

[gab, 2013/09/13 15:06:19]

How about: --no-error-if-absent or something more verbose like that?

To avoid confusion between this and --interactive option proposed above.

[sukolsak, 2013/09/13 15:59:33]

Will do.

[gab, 2013/09/13 20:12:55]

I meant in this CL...

[sukolsak, 2013/09/13 23:11:14]

Done. Yes, I was waiting for your reply.

[gab, 2013/09/16 13:59:58]

Ah ok, my bad :)!

+                    default=False, help='Silently return if the registry key '
+                                        'for uninstalling Chrome is not found')
   options, _ = parser.parse_args()
 
   # TODO(sukolsak): Add support for uninstalling MSI-based Chrome installs when
   # we support testing MSIs.
   if options.system_level:
     root_key = _winreg.HKEY_LOCAL_MACHINE
   else:
     root_key = _winreg.HKEY_CURRENT_USER
   sub_key = ('SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\%s' %
              options.chrome_long_name)
   # Query the key. It will throw a WindowsError if the key doesn't exist.
   try:
     key = _winreg.OpenKey(root_key, sub_key, 0, _winreg.KEY_QUERY_VALUE)
   except WindowsError:
+    if options.silent:
+      return 1

[gab, 2013/09/13 15:06:19]

I'd say we should return 0 here.

[sukolsak, 2013/09/13 15:59:33]

Will do.

[gab, 2013/09/13 20:12:55]

I meant in this CL...

[sukolsak, 2013/09/13 23:11:14]

Done.

     raise KeyError('Registry key %s\\%s is missing' % (
         'HKEY_LOCAL_MACHINE' if options.system_level else 'HKEY_CURRENT_USER',
         sub_key))
   uninstall_string, _ = _winreg.QueryValueEx(key, 'UninstallString')
   exit_status = subprocess.call(uninstall_string + ' --force-uninstall',
                                 shell=True)
   # The exit status for successful uninstallation of Chrome is 19 (see
   # chrome/installer/util/util_constants.h).
   if exit_status != 19:
     raise Exception('Could not uninstall Chrome. The installer exited with '
                     'status %d.' % exit_status)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())