Merge lp:~diegosarmentero/ubuntuone-control-panel/current-device-removed into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Restarting the wizard on current device removed (LP: #973830).

Currently was showing the wizard in the last page shown, which in this case tries to get the web folders, but after the current device removed, couldn't perform that operation because it doesn't have credentials.

[Roberto Alsina (ralsina)]

+1

review: Approve

[dobey (dobey)]

review: Approve

[Alejandro J. Cura (alecu)]

+1

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-03-30 17:34:33 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-04-10 19:18:18 +0000
@@ -93,6 +93,7 @@
     @log_call(logger.debug)
     def on_credentials_not_found(self):
         """Credentials are not found or were removed."""
+        self.ui.wizard.restart()
         self.ui.switcher.setCurrentWidget(self.ui.wizard)
         self.is_processing = False
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-03-26 21:00:47 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-04-10 19:18:18 +0000
@@ -68,9 +68,11 @@
 
     def test_on_credentials_not_found(self):
         """The wizard panel is shown."""
+        self.patch(self.ui.ui.wizard, 'restart', self._set_called)
         self.ui.on_credentials_found()
         self.ui.on_credentials_not_found()
         self.assertIs(self.ui.ui.switcher.currentWidget(), self.ui.ui.wizard)
+        self.assertEqual(self._called, ((), {}))
 
     @defer.inlineCallbacks
     def test_on_credentials_found_called(self):