Merge lp:~ralsina/ubuntuone-windows-installer/install-betterer into lp:ubuntuone-windows-installer

[Roberto Alsina]

Fix tests broken by a previous branch.

Fix tests broken by a previous branch.

To test IRL, start the wizard, and from the first (license) page, cancel and confirm you want to uninstall. It should start the uninstaller.

[lp:~ralsina/ubuntuone-windows-installer/install-betterer]

63. By Roberto Alsina on 2011-09-13

nicer asserts

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-12 18:48:09 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-13 14:50:42 +0000
@@ -69,7 +69,7 @@
         folder = os.path.dirname(folder_path_qt_dir)
         uninstall_path = os.path.join(os.path.dirname(folder), "uninstall.exe")
         self.assertEqual(self._called,
-            ((None, 'runas', uninstall_path, '--mode qt', '', 0), {}))
+            ((None, 'runas', uninstall_path, '--mode win32', '', 0), {}))
 
     def test_execute_uninstall_on_licence_cancel_frozen(self):
         """Pressing Disagree button from license page the uninstall is exec."""
@@ -79,11 +79,11 @@
         self.addCleanup(delattr, sys, "frozen")
         utils.uninstall_application()
         self.assertTrue(self._called[0][0] is None)
-        self.assertTrue("uninstall.exe" in self._called[0][2])
-        self.assertTrue('runas' == self._called[0][1])
-        self.assertTrue('--mode qt' == self._called[0][3])
-        self.assertTrue('' == self._called[0][4])
-        self.assertTrue(0 == self._called[0][5])
+        self.assertIn("uninstall.exe", self._called[0][2])
+        self.assertEqual('runas', self._called[0][1])
+        self.assertEqual('--mode win32', self._called[0][3])
+        self.assertEqual('', self._called[0][4])
+        self.assertEqual(0, self._called[0][5])
 
 
 class FakeRegistry(object):