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

[Diego Sarmentero]

Allow the installer to be closed if the uninstaller couldn't be executed.

Allow the installer to be closed if the uninstaller couldn't be executed.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

* I understand we can't patch sys to set frozen to it, but we should add a cleanup call to restore the absence of this attribute. So, this code:

        sys.frozen = True

should be followed by something like:

        self.addCleanup(del, sys.frozen)

* Same for this code, we need to restore the env like it was before the test run:

        if hasattr(sys, "frozen"):
            delattr(sys, "frozen")

should migrate to something like:

        frozen = getattr(sys, "frozen", None)
        if frozen is not None:
            delattr(sys, "frozen")
            self.addCleanup(setattr, sys, 'frozen', frozen)

* Unless I'm missing something, there is no need to define the FakeCaller, isn't? The test case base class inherits from a testcase that has the _set_called method defined, so you can replace:

        self.patch(win32api, "ShellExecute", fake_caller.call)
        self.assertFalse(FakeCaller.was_called)

with:

        self.patch(win32api, "ShellExecute", self._set_called)
        self.assertFalse(self._called)

Also, this code:

        self.patch(os.path, "exists", fake_caller.exists)

can morph into (is easier to read, no need to scroll up to see what does fake_caller is/does):

        self.patch(os.path, "exists", lambda path: True)

Thanks!

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

There seems to be a conflict now that ralsina's fix-tests branch landed.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

* This does not work:

self.addCleanup(setattr(sys, 'frozen', frozen))

addCleanup receives a function, so it should be:

self.addCleanup(setattr, sys, 'frozen', frozen)

* This self.addCleanup(lambda: delattr(sys, "frozen")) can be improved to self.addCleanup(delattr, sys, "frozen").

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Why you're asserting this?

self.assertFalse(hasattr(self, '_called'))

I would expect the test to assert self.assertFalse(self._called), I can't see how the _called attr disappears.

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

> Why you're asserting this?
>
> self.assertFalse(hasattr(self, '_called'))
>
> I would expect the test to assert self.assertFalse(self._called), I can't see
> how the _called attr disappears.

I'm testing that this function is not being called really, and BaseTestCase create self._called when that function is executed, so i'm testing that the attribute doesn't exists.

[Natalia Bidart (nataliabidart)]

Seems like some class in the inheriting chain is not calling setUp, so I would recommend fixing that instead of the proposed hasattr call:

     25 class TestCase(BaseTestCase):
     26 """Basics for testing."""
     27
     28 assertIs = BaseTestCase.assertIdentical
     29
     30 def setUp(self):
     31 self._called = False

[Natalia Bidart (nataliabidart)]

Looks good! Please remove the unneeded call to setUp.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-windows-installer/close-on-license into lp:ubuntuone-windows-installer failed. Below is the output from the failed tests.

running build
Compiled data/qt/local_folders.ui into ubuntuone_installer/gui/qt/ui/local_folders_ui.py
Compiled data/qt/preferences.ui into ubuntuone_installer/gui/qt/ui/preferences_ui.py
Compiled data/qt/congratulations.ui into ubuntuone_installer/gui/qt/ui/congratulations_ui.py
compiled data/qt/images.qrc into ubuntuone_installer/gui/qt/ui/images_rc.py
Compiled data/qt/folders.ui into ubuntuone_installer/gui/qt/ui/folders_ui.py
Compiled data/qt/sync_now_or_later.ui into ubuntuone_installer/gui/qt/ui/sync_now_or_later_ui.py
Compiled data/qt/license.ui into ubuntuone_installer/gui/qt/ui/license_ui.py
Compiled data/qt/choose_sign_in.ui into ubuntuone_installer/gui/qt/ui/choose_sign_in_ui.py
Compiled data/qt/side_widget.ui into ubuntuone_installer/gui/qt/ui/side_widget_ui.py
Compiled data/qt/sign_in.ui into ubuntuone_installer/gui/qt/ui/sign_in_ui.py
Compiled data/qt/setup_account.ui into ubuntuone_installer/gui/qt/ui/setup_account_ui.py
Compiled data/qt/are_you_sure.ui into ubuntuone_installer/gui/qt/ui/are_you_sure_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/logger.py -> build/lib.linux-i686-2.7/ubuntuone_installer
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui
copying ubuntuone_installer/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/enhanced_check_box.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/forgotten.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/side_widget.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/local_folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/setup_account.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/preferences.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/currentuser.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/sync_now_or_later.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/are_you_sure.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
running build_scripts
creating build/scripts-2.7
copying and adjusting bin/ubuntuone-installer-qt -> build/scripts-2.7
changing mode of build/scripts-2.7/ubuntuone-installer-qt from 644 to 755
running build_i18n
intltoo...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-windows-installer/close-on-license into lp:ubuntuone-windows-installer failed. Below is the output from the failed tests.

running build
Compiled data/qt/local_folders.ui into ubuntuone_installer/gui/qt/ui/local_folders_ui.py
Compiled data/qt/preferences.ui into ubuntuone_installer/gui/qt/ui/preferences_ui.py
Compiled data/qt/congratulations.ui into ubuntuone_installer/gui/qt/ui/congratulations_ui.py
compiled data/qt/images.qrc into ubuntuone_installer/gui/qt/ui/images_rc.py
Compiled data/qt/folders.ui into ubuntuone_installer/gui/qt/ui/folders_ui.py
Compiled data/qt/sync_now_or_later.ui into ubuntuone_installer/gui/qt/ui/sync_now_or_later_ui.py
Compiled data/qt/license.ui into ubuntuone_installer/gui/qt/ui/license_ui.py
Compiled data/qt/choose_sign_in.ui into ubuntuone_installer/gui/qt/ui/choose_sign_in_ui.py
Compiled data/qt/side_widget.ui into ubuntuone_installer/gui/qt/ui/side_widget_ui.py
Compiled data/qt/sign_in.ui into ubuntuone_installer/gui/qt/ui/sign_in_ui.py
Compiled data/qt/setup_account.ui into ubuntuone_installer/gui/qt/ui/setup_account_ui.py
Compiled data/qt/are_you_sure.ui into ubuntuone_installer/gui/qt/ui/are_you_sure_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/logger.py -> build/lib.linux-i686-2.7/ubuntuone_installer
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui
copying ubuntuone_installer/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/enhanced_check_box.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/forgotten.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/side_widget.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/local_folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/setup_account.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/preferences.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/currentuser.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/sync_now_or_later.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/are_you_sure.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
running build_scripts
creating build/scripts-2.7
copying and adjusting bin/ubuntuone-installer-qt -> build/scripts-2.7
changing mode of build/scripts-2.7/ubuntuone-installer-qt from 644 to 755
running build_i18n
intltoo...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-windows-installer/close-on-license into lp:ubuntuone-windows-installer failed. Below is the output from the failed tests.

running build
Compiled data/qt/local_folders.ui into ubuntuone_installer/gui/qt/ui/local_folders_ui.py
Compiled data/qt/preferences.ui into ubuntuone_installer/gui/qt/ui/preferences_ui.py
Compiled data/qt/congratulations.ui into ubuntuone_installer/gui/qt/ui/congratulations_ui.py
compiled data/qt/images.qrc into ubuntuone_installer/gui/qt/ui/images_rc.py
Compiled data/qt/folders.ui into ubuntuone_installer/gui/qt/ui/folders_ui.py
Compiled data/qt/sync_now_or_later.ui into ubuntuone_installer/gui/qt/ui/sync_now_or_later_ui.py
Compiled data/qt/license.ui into ubuntuone_installer/gui/qt/ui/license_ui.py
Compiled data/qt/choose_sign_in.ui into ubuntuone_installer/gui/qt/ui/choose_sign_in_ui.py
Compiled data/qt/side_widget.ui into ubuntuone_installer/gui/qt/ui/side_widget_ui.py
Compiled data/qt/sign_in.ui into ubuntuone_installer/gui/qt/ui/sign_in_ui.py
Compiled data/qt/setup_account.ui into ubuntuone_installer/gui/qt/ui/setup_account_ui.py
Compiled data/qt/are_you_sure.ui into ubuntuone_installer/gui/qt/ui/are_you_sure_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/logger.py -> build/lib.linux-i686-2.7/ubuntuone_installer
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui
copying ubuntuone_installer/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/enhanced_check_box.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/forgotten.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/side_widget.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/local_folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/setup_account.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/preferences.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/currentuser.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/sync_now_or_later.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/are_you_sure.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
running build_scripts
creating build/scripts-2.7
copying and adjusting bin/ubuntuone-installer-qt -> build/scripts-2.7
changing mode of build/scripts-2.7/ubuntuone-installer-qt from 644 to 755
running build_i18n
intltoo...

=== modified file 'ubuntuone_installer/gui/qt/tests/__init__.py'
--- ubuntuone_installer/gui/qt/tests/__init__.py	2011-06-22 10:47:08 +0000
+++ ubuntuone_installer/gui/qt/tests/__init__.py	2011-09-01 18:28:36 +0000
@@ -28,21 +28,6 @@
 NO_OP = lambda *args: None
 
 
-def skip_if_abstract_class(test):
-    """Decorator to skip a test if is an abstract class."""
-
-    def inner(instance):
-        """Skip a test if is an abstract class."""
-        abstract = instance.class_ui is None
-        result = None
-        if not abstract:
-            result = test(instance)
-
-        return result
-
-    return inner
-
-
 class FakeUi(FakedObject):
     """A fake Ui object."""
 
@@ -55,13 +40,14 @@
     class_ui = None
     kwargs = {}
 
-    @skip_if_abstract_class
     def setUp(self):
         super(BaseTestCase, self).setUp()
         # self.class_ui is not callable
         # pylint: disable=E1102
         # pylint: disable=C0103
-        self.ui = self.class_ui(**self.kwargs)
+        self.ui = None
+        if self.class_ui is not None:
+            self.ui = self.class_ui(**self.kwargs)
 
         if hasattr(self.ui, 'backend'):
             # clean backend calls

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-08-30 14:11:48 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-01 18:28:36 +0000
@@ -31,17 +31,38 @@
 
 
 class UninstallerTestCase(BaseTestCase):
-
     """Test the uninstaller."""
 
+    def test_execute_uninstall_on_licence_cancel_file_not_exists(self):
+        """Pressing Disagree button from license page the uninstall is exec."""
+        # If it's frozen this test fails because the path
+        # depends on the location of the exe
+        frozen = getattr(sys, "frozen", None)
+        if frozen is not None:
+            delattr(sys, "frozen")
+            self.addCleanup(setattr, sys, 'frozen', frozen)
+        self.patch(win32api, "ShellExecute", self._set_called)
+        self.assertFalse(self._called)
+
+    def test_execute_uninstall_on_licence_cancel_frozen_file_not_exists(self):
+        """Pressing Disagree button from license page the uninstall is exec."""
+        self.patch(win32api, "ShellExecute", self._set_called)
+        sys.frozen = True
+        self.addCleanup(delattr, sys, "frozen")
+        utils.uninstall_application()
+        self.assertFalse(self._called)
+
     def test_execute_uninstall_on_licence_cancel(self):
         """Pressing Disagree button from license page the uninstall is exec."""
         self.patch(win32api, "ShellExecute", self._set_called)
+        self.patch(os.path, "exists", lambda path: True)
         utils.uninstall_application()
         # If it's frozen this test fails because the path
         # depends on the location of the exe
-        if hasattr(sys, "frozen"):
+        frozen = getattr(sys, "frozen", None)
+        if frozen is not None:
             delattr(sys, "frozen")
+            self.addCleanup(setattr, sys, 'frozen', frozen)
         exec_path = os.path.abspath(__file__)
         folder_path_utils_dir = os.path.dirname(exec_path)
         folder_path_qt_dir = os.path.dirname(folder_path_utils_dir)
@@ -53,7 +74,9 @@
     def test_execute_uninstall_on_licence_cancel_frozen(self):
         """Pressing Disagree button from license page the uninstall is exec."""
         self.patch(win32api, "ShellExecute", self._set_called)
+        self.patch(os.path, "exists", lambda path: True)
         sys.frozen = True
+        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])

=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-08-30 14:11:48 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-09-01 18:28:36 +0000
@@ -38,9 +38,10 @@
         exec_path = os.path.dirname(__file__)
     folder = os.path.dirname(exec_path)
     uninstall_path = os.path.join(os.path.dirname(folder), "uninstall.exe")
-    win32api.ShellExecute(None, 'runas',
-        uninstall_path,
-        '--mode qt', '', 0)
+    if os.path.exists(uninstall_path):
+        win32api.ShellExecute(None, 'runas',
+            uninstall_path,
+            '--mode qt', '', 0)
 
 
 def start_control_panel():