Merge lp:~diegosarmentero/ubuntuone-windows-installer/local-folders-get_info-fail into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Fixed: LocalFoldersPage.get_info does not hide the overlay on backend error (LP: #828944).

Fixed: LocalFoldersPage.get_info does not hide the overlay on backend error (LP: #828944).

[Natalia Bidart (nataliabidart)]

ubuntuone_installer/gui/qt/tests/test_local_folders.py:
    301: [C0111, LocalFoldersTestCase.raise_exception] Missing docstring

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/local-folders-get_info-fail]

76. By Diego Sarmentero on 2011-09-30

Fixed lint issues and improved get_info

77. By Diego Sarmentero on 2011-09-30

Added overlay.hide inside finally.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-09-13 02:10:13 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-09-30 15:43:23 +0000
@@ -160,10 +160,11 @@
                 item = yield self.add_folder(folder_name, validate=True)
             self.timer.start(2000)
             self.timer.timeout.connect(self.update_sizes)
-            self.wizard().overlay.hide()
             self.wizard().currentIdChanged.connect(self.changed_page)
         except:
             logger.exception("Error getting backend info:")
+        finally:
+            self.wizard().overlay.hide()
 
     @QtCore.pyqtSlot("int")
     @inlineCallbacks
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
--- ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-15 17:49:32 +0000
+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-30 15:43:23 +0000
@@ -292,6 +292,25 @@
         self.assertEqual(self.ui.ui.folder_list.topLevelItemCount(), 4)
 
     @defer.inlineCallbacks
+    def test_get_info_not_fail(self):
+        """Check if the overlay is hidden on get_info finish."""
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 0)
+        yield self.ui.get_info()
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 1)
+
+    def raise_exception(self):
+        """Raise exception to make the get_info method fail."""
+        raise Exception()
+
+    @defer.inlineCallbacks
+    def test_get_info_fail(self):
+        """Check if the overlay is hidden on fail."""
+        self.patch(self.ui.cp_backend, "volumes_info", self.raise_exception)
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 0)
+        yield self.ui.get_info()
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 1)
+
+    @defer.inlineCallbacks
     def test_subscribed_udf_checked(self):
         """Check that subscribed UDF items are created correctly."""
         yield self.ui.get_info()