Merge lp:~nataliabidart/ubuntuone-control-panel/connect-after-computer-adding into lp:ubuntuone-control-panel

[Natalia Bidart]

- After initial computer adding, syncdameon is asked to connect (LP: #715873).

To test IRL, please remove your current device from the cloud, and verify that syncdaemon is not running. Run the control panel from this branch with:

PYTHONPATH=. bin/ubuntuone-control-panel-gtk

Once you login, you should confirm that syncdaemon is not only started, but its state is connected.
If you try this same procedure in trunk, you will notice that after login, syncdameon is started but not connected.

[dobey (dobey)]

review: Approve

[Eric Casteleijn (thisfred)]

Looks good, and connects on adding the device.

review: Approve

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-03-22 19:14:37 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-03-25 20:53:25 +0000
@@ -1507,13 +1507,14 @@
         self._update_quota(msg='')
 
 
-class ControlPanel(gtk.Notebook):
+class ControlPanel(gtk.Notebook, ControlPanelMixin):
     """The control panel per se, can be added into any other widget."""
 
     # should not be any larger than 736x525
 
     def __init__(self, main_window):
         gtk.Notebook.__init__(self)
+        ControlPanelMixin.__init__(self)
         gtk.link_button_set_uri_hook(uri_hook)
 
         self.main_window = main_window
@@ -1550,6 +1551,9 @@
             if credentials_are_new:
                 # redirect user to services page to start using Ubuntu One
                 self.management.services_button.clicked()
+                # instruct syncdaemon to connect
+                self.backend.connect_files(reply_handler=NO_OP,
+                                           error_handler=error_handler)
 
             self.next_page()
 

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-03-23 14:40:16 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-03-25 20:53:25 +0000
@@ -179,7 +179,7 @@
 
         self.assert_current_tab_correct(self.ui.management)
 
-    def test_credentials_found_shows_dashboard_management_panel(self):
+    def test_credentials_found_shows_dashboard_panel(self):
         """On 'credentials-found' signal, the management panel is shown.
 
         If first signal parameter is False, visible tab should be dashboard.
@@ -193,7 +193,7 @@
                          self.ui.management.DASHBOARD_PAGE)
         self.assertEqual(self._called, ((), {}))
 
-    def test_credentials_found_shows_volumes_management_panel(self):
+    def test_credentials_found_shows_services_panel(self):
         """On 'credentials-found' signal, the management panel is shown.
 
         If first signal parameter is True, visible tab should be services.
@@ -206,6 +206,12 @@
         self.assertEqual(self.ui.management.notebook.get_current_page(),
                          self.ui.management.SERVICES_PAGE)
 
+    def test_credentials_found_connects_syncdaemon(self):
+        """On 'credentials-found' signal, ask syncdaemon to connect."""
+        # credentials are new
+        self.ui.overview.emit('credentials-found', True, object())
+        self.assert_backend_called('connect_files', ())
+
     def test_local_device_removed_shows_overview_panel(self):
         """On 'local-device-removed' signal, the overview panel is shown."""
         self.ui.overview.emit('credentials-found', True, object())