Merge lp:~diegosarmentero/ubuntuone-windows-installer/close-on-license-again into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Fixed: Wizard is not closed on license agreement screen (LP: #835167).

Fixed: Wizard is not closed on license agreement screen (LP: #835167).

[Manuel de la Peña (mandel)]

What happened here is that the return value of the dialog changed. I think that the best way to approach this would be to have a couple of constants against the ones we can compare. For example:

if AreYouSure(self).exec_() == AreYouSure(self).YES:
    print 'You are sure!'

That way if the value returned changed the code is still valid and the reponsability of ensuring that the dialog works in on the dialog developer and not the user.

review: Needs Fixing

[Manuel de la Peña (mandel)]

> What happened here is that the return value of the dialog changed. I think
> that the best way to approach this would be to have a couple of constants
> against the ones we can compare. For example:
>
> if AreYouSure(self).exec_() == AreYouSure.YES:
> print 'You are sure!'
>
> That way if the value returned changed the code is still valid and the
> reponsability of ensuring that the dialog works in on the dialog developer and
> not the user.

Remove the (self), sorry for the typo, stupid copy and paste :P

[lp:~diegosarmentero/ubuntuone-windows-installer/close-on-license-again]

78. By Diego Sarmentero on 2011-10-07

Improved AreYouSure result comparison.

[Manuel de la Peña (mandel)]

Much nicer!!!

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-29 13:26:44 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-10-07 17:42:17 +0000
@@ -455,12 +455,12 @@
         if result == 1:  # Cancelled
             qt.utils.start_control_panel()
         elif self.currentId() == self.LICENSE_PAGE:
-            if not AreYouSure(self).exec_():
+            if AreYouSure(self).exec_() == QtGui.QDialog.Accepted:
                 qt.utils.uninstall_application()
             else:
                 return
         elif self.currentId() != self.CONGRATULATIONS_PAGE:
-            if not AreYouSure(self).exec_():
+            if AreYouSure(self).exec_() == QtGui.QDialog.Rejected:
                 return
         if self.close_callback is not None:
             self.close_callback()

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-29 13:26:44 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-10-07 17:42:17 +0000
@@ -220,8 +220,8 @@
         self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
-        gui.AreYouSure.result = 0
-        self.patch(utils, "uninstall_application", self._set_called)
+        gui.AreYouSure.result = 1
+        self.patch(gui.qt.utils, "uninstall_application", self._set_called)
         self.ui.done(result=0)
         self.assertTrue(self._called)
 
@@ -231,8 +231,8 @@
         self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
-        gui.AreYouSure.result = 0
-        self.patch(utils, "uninstall_application", self._set_called)
+        gui.AreYouSure.result = 1
+        self.patch(gui.qt.utils, "uninstall_application", self._set_called)
         self.ui.done(result=0)
         self.assertTrue(self._called)