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

Proposed by Roberto Alsina on 2011-09-13
Status: Merged
Approved by: Natalia Bidart on 2011-09-13
Approved revision: 63
Merged at revision: 61
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/install-betterer
Merge into: lp:ubuntuone-windows-installer
Diff against target: 29 lines (+6/-6)
1 file modified
ubuntuone_installer/gui/qt/utils/tests/test_windows.py (+6/-6)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/install-betterer
Reviewer Review Type Date Requested Status
Natalia Bidart 2011-09-13 Approve on 2011-09-13
Review via email: mp+75186@code.launchpad.net

Commit message

Fix tests broken by a previous branch.

Description of the change

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.

To post a comment you must log in.
63. By Roberto Alsina on 2011-09-13

nicer asserts

Natalia Bidart (nataliabidart) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
69 folder = os.path.dirname(folder_path_qt_dir)69 folder = os.path.dirname(folder_path_qt_dir)
70 uninstall_path = os.path.join(os.path.dirname(folder), "uninstall.exe")70 uninstall_path = os.path.join(os.path.dirname(folder), "uninstall.exe")
71 self.assertEqual(self._called,71 self.assertEqual(self._called,
72 ((None, 'runas', uninstall_path, '--mode qt', '', 0), {}))72 ((None, 'runas', uninstall_path, '--mode win32', '', 0), {}))
7373
74 def test_execute_uninstall_on_licence_cancel_frozen(self):74 def test_execute_uninstall_on_licence_cancel_frozen(self):
75 """Pressing Disagree button from license page the uninstall is exec."""75 """Pressing Disagree button from license page the uninstall is exec."""
@@ -79,11 +79,11 @@
79 self.addCleanup(delattr, sys, "frozen")79 self.addCleanup(delattr, sys, "frozen")
80 utils.uninstall_application()80 utils.uninstall_application()
81 self.assertTrue(self._called[0][0] is None)81 self.assertTrue(self._called[0][0] is None)
82 self.assertTrue("uninstall.exe" in self._called[0][2])82 self.assertIn("uninstall.exe", self._called[0][2])
83 self.assertTrue('runas' == self._called[0][1])83 self.assertEqual('runas', self._called[0][1])
84 self.assertTrue('--mode qt' == self._called[0][3])84 self.assertEqual('--mode win32', self._called[0][3])
85 self.assertTrue('' == self._called[0][4])85 self.assertEqual('', self._called[0][4])
86 self.assertTrue(0 == self._called[0][5])86 self.assertEqual(0, self._called[0][5])
8787
8888
89class FakeRegistry(object):89class FakeRegistry(object):

Subscribers

People subscribed via source and target branches