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

chrome/test/mini_installer/test_installer.py

Index: chrome/test/mini_installer/test_installer.py
diff --git a/chrome/test/mini_installer/test_installer.py b/chrome/test/mini_installer/test_installer.py
index e0614243b0ee51d3c5219d77e050f43e494f4bb3..b2280fc143bc161ffa51103621c10be3123605f0 100644
--- a/chrome/test/mini_installer/test_installer.py
+++ b/chrome/test/mini_installer/test_installer.py
@@ -69,7 +69,7 @@ class InstallerTest(unittest.TestCase):
     self.assertEqual(1, len(self._test) % 2,
                      'The length of test array must be odd')
 
-    # TODO(sukolsak): run a reset command that puts the machine in clean state.
+    self._RunCleanCommand()

[gab, 2013/09/10 22:19:05]

This shouldn't always be run by default imo... as I remember grt saying, if you
have Chrome installed on your machine and you run this script unknowingly it
shouldn't delete your Chrome from your system.

It's ok for it to warn you though (popup or stderr).

It's also ok to have a flag that would force cleaning without prompting (and the
bots would always use that flag); but, again, it's not okay to risk deleting
Chrome from the machines of any random dev trying this script.

[grt (UTC plus 2), 2013/09/11 03:01:41]

I like the idea of:
1) having the test fail if it finds that the machine isn't in the proper state
2) having a command line argument that puts the machine in the proper state if
needed
3) having the bot configured to always use the above command line argument

grt would be sad if he ran this and it nuked his chromes. :-)

[sukolsak, 2013/09/13 09:10:21]

Done.

[sukolsak, 2013/09/13 09:10:21]

Done.

Checking whether Chrome is installed (and is installed properly) before deciding
whether to have the test fail is kind of tricky. So, I choose to always warn the
user that the script will remove Chrome, whether Chrome is currently installed
or not, and ask for confirmation.

 
     state = self._test[0]
     self._VerifyState(state)
@@ -118,6 +118,20 @@ class InstallerTest(unittest.TestCase):
       self.fail('Command %s returned non-zero exit status %s' % (
           resolved_command, exit_status))
 
+  def _RunCleanCommand(self):
+    """Puts the machine in the clean state (i.e. Chrome not installed)."""
+    # TODO(sukolsak): Read the clean state from the config file and clean
+    # the machine according to it.
+    # TODO(sukolsak): Handle Chrome SxS installs.
+    command = ('python uninstall_chrome.py '
+               '--chrome-long-name="$CHROME_LONG_NAME" & '
+               'python uninstall_chrome.py '
+               '--chrome-long-name="$CHROME_LONG_NAME" --system-level')
+    resolved_command = self._path_resolver.ResolvePath(command)
+    script_dir = os.path.dirname(os.path.abspath(__file__))

[gab, 2013/09/10 22:19:05]

Since we now need |script_dir| in more than one place, how about making it a
member of InstallerTest?

[sukolsak, 2013/09/13 09:10:21]

|script_dir| doesn't seem like a state of an object to me. And we use it only
twice. What do you think?

+    subprocess.call(resolved_command, shell=True, cwd=script_dir,
+                    stderr=open(os.devnull, 'w'))

[gab, 2013/09/10 22:19:05]

So we trash all stderr output :(... why? If it's only to avoid the case where
there is no install present, perhaps uninstall_chrome.py could have an option to
silently return if no install is found instead?

[sukolsak, 2013/09/13 09:10:21]

Done.

+
 
 def MergePropertyDictionaries(current_property, new_property):
   """Merges the new property dictionary into the current property dictionary.