Merge lp:~ralsina/ubuntuone-windows-installer/fix-mode-qt into lp:ubuntuone-windows-installer

Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 39
Merged at revision: 39
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/fix-mode-qt
Merge into: lp:ubuntuone-windows-installer
Diff against target: 22 lines (+2/-2)
2 files modified
ubuntuone_installer/gui/qt/utils/tests/test_windows.py (+1/-1)
ubuntuone_installer/gui/qt/utils/windows.py (+1/-1)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/fix-mode-qt
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) Approve
Review via email: mp+73088@code.launchpad.net

Commit message

Call uninstaller with proper arguments

Description of the change

Call uninstaller with proper arguments

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

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-08-24 15:24:03 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py 2011-08-26 18:56:23 +0000
@@ -44,7 +44,7 @@
44 folder = os.path.dirname(folder_path_qt_dir)44 folder = os.path.dirname(folder_path_qt_dir)
45 uninstall_path = os.path.join(os.path.dirname(folder), "uninstall.exe")45 uninstall_path = os.path.join(os.path.dirname(folder), "uninstall.exe")
46 self.assertEqual(self._called,46 self.assertEqual(self._called,
47 ((None, 'runas', uninstall_path, '--mode=qt', '', 0), {}))47 ((None, 'runas', uninstall_path, '--mode qt', '', 0), {}))
4848
49 def test_execute_uninstall_on_licence_cancel_frozen(self):49 def test_execute_uninstall_on_licence_cancel_frozen(self):
50 """Pressing Disagree button from license page the uninstall is exec."""50 """Pressing Disagree button from license page the uninstall is exec."""
5151
=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py 2011-08-24 11:43:58 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py 2011-08-26 18:56:23 +0000
@@ -35,4 +35,4 @@
35 uninstall_path = os.path.join(os.path.dirname(folder), "uninstall.exe")35 uninstall_path = os.path.join(os.path.dirname(folder), "uninstall.exe")
36 win32api.ShellExecute(None, 'runas',36 win32api.ShellExecute(None, 'runas',
37 uninstall_path,37 uninstall_path,
38 '--mode=qt', '', 0)38 '--mode qt', '', 0)

Subscribers

People subscribed via source and target branches