Merge lp:~nataliabidart/ubuntuone-control-panel/refactor-devices into lp:ubuntuone-control-panel

[Natalia Bidart]

- Device and account info is now loaded just like other widgets (independently from their parents).
- Device info is no longer faked, and local device is also a DeviceWidget (LP: #800362).

[John Lenton (chipaca)]

Works as advertised.

review: Approve

[Roberto Alsina (ralsina)]

Works for me.

review: Approve

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2011-06-20 22:21:30 +0000
+++ data/qt/controlpanel.ui	2011-06-21 22:49:26 +0000
@@ -25,7 +25,7 @@
      <item>
       <widget class="QLabel" name="greeting_label">
        <property name="text">
-        <string>Hello Lisette!</string>
+        <string notr="true"/>
        </property>
       </widget>
      </item>
@@ -43,9 +43,9 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="usage_label">
+      <widget class="QLabel" name="quota_usage_label">
        <property name="text">
-        <string>39% of 22 GB in use</string>
+        <string notr="true"/>
        </property>
       </widget>
      </item>

=== modified file 'data/qt/devices.ui'
--- data/qt/devices.ui	2011-06-20 22:21:30 +0000
+++ data/qt/devices.ui	2011-06-21 22:49:26 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>558</width>
-    <height>156</height>
+    <width>692</width>
+    <height>539</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -30,8 +30,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>535</width>
-        <height>136</height>
+        <width>657</width>
+        <height>519</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout_2">
@@ -82,18 +82,7 @@
        <item row="1" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
-          <widget class="QLabel" name="device_icon_label">
-           <property name="pixmap">
-            <pixmap resource="images.qrc">:/computer.png</pixmap>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="device_name_label">
-           <property name="text">
-            <string>This device</string>
-           </property>
-          </widget>
+          <layout class="QVBoxLayout" name="local_device_box"/>
          </item>
          <item>
           <spacer name="horizontalSpacer_2">
@@ -118,7 +107,7 @@
         </layout>
        </item>
        <item row="7" column="0">
-        <layout class="QVBoxLayout" name="devices_list_verticallayout"/>
+        <layout class="QVBoxLayout" name="remote_devices_box"/>
        </item>
       </layout>
      </widget>

=== modified file 'data/qt/filesyncstatus.ui'
--- data/qt/filesyncstatus.ui	2011-06-20 22:21:30 +0000
+++ data/qt/filesyncstatus.ui	2011-06-21 22:49:26 +0000
@@ -19,7 +19,7 @@
      <item>
       <widget class="QLabel" name="sync_status_label">
        <property name="text">
-        <string>Status unknown</string>
+        <string notr="true"/>
        </property>
        <property name="buddy">
         <cstring>sync_status_button</cstring>
@@ -32,7 +32,7 @@
         <string>test</string>
        </property>
        <property name="text">
-        <string>Action unknown</string>
+        <string notr="true"/>
        </property>
       </widget>
      </item>

=== modified file 'data/qt/services.ui'
--- data/qt/services.ui	2011-06-20 22:21:30 +0000
+++ data/qt/services.ui	2011-06-21 22:49:26 +0000
@@ -21,7 +21,7 @@
        <item>
         <widget class="QLabel" name="mobile_plan_title_label">
          <property name="text">
-          <string>Ubuntu One Mobile</string>
+          <string notr="true"/>
          </property>
         </widget>
        </item>
@@ -41,7 +41,7 @@
        <item>
         <widget class="QLabel" name="mobile_plan_trial_label">
          <property name="text">
-          <string>14 days free trial left</string>
+          <string notr="true"/>
          </property>
         </widget>
        </item>
@@ -57,7 +57,7 @@
      <item>
       <widget class="QLabel" name="mobile_plan_billing_label">
        <property name="text">
-        <string>Billed Monthly - $3.99 per month</string>
+        <string notr="true"/>
        </property>
       </widget>
      </item>
@@ -107,7 +107,7 @@
        <item>
         <widget class="QLabel" name="storage_plan_total_label">
          <property name="text">
-          <string>22 GB in total</string>
+          <string notr="true"/>
          </property>
         </widget>
        </item>
@@ -127,7 +127,7 @@
        <item>
         <widget class="QLabel" name="storage_plan_usage_label">
          <property name="text">
-          <string>39% in use</string>
+          <string notr="true"/>
          </property>
         </widget>
        </item>
@@ -143,7 +143,7 @@
      <item>
       <widget class="QLabel" name="storage_plan_label">
        <property name="text">
-        <string>2 GB from your free account</string>
+        <string notr="true"/>
        </property>
        <property name="textFormat">
         <enum>Qt::PlainText</enum>

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2011-06-20 23:23:45 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2011-06-21 22:49:26 +0000
@@ -20,6 +20,7 @@
 """The user interface for the control panel for Ubuntu One."""
 
 from PyQt4 import QtGui, QtCore
+from twisted.internet import defer
 
 from ubuntuone.controlpanel import backend
 from ubuntuone.controlpanel.logger import setup_logging, log_call
@@ -27,26 +28,6 @@
 from ubuntuone.controlpanel.gui.qt import uri_hook
 from ubuntuone.controlpanel.gui.qt.ui import controlpanel_ui
 
-SAMPLE_DEVICES_INFO = [
-    {
-        "type": "Computer",
-        "name": "toshiba laptop",
-        "is_local": True,
-        "configurable": False,
-    },
-    {
-        "type": "Computer",
-        "name": "desktop i5",
-        "is_local": False,
-        "configurable": False,
-    },
-    {
-        "type": "Phone",
-        "name": "nokia 1100",
-        "is_local": False,
-        "configurable": False,
-    },
-]
 
 logger = setup_logging('qt.controlpanel')
 
@@ -61,34 +42,26 @@
         self.ui.setupUi(self)
 
         self.backend = backend.ControlBackend()
-
         logger.debug('%s: started.', self.__class__.__name__)
-        self.get_account_info()
-        self.get_devices_info()
-
-    def get_account_info(self):
-        """Get and update the account info from the webservice."""
-        d = self.backend.account_info()
-        d.addCallback(self.got_account_info)
-
-    def get_devices_info(self):
-        """Get and update the list of devices."""
-        # TODO: get the info from the backend
-        # this should be changed when have a working dbus replacement on win32
-        #d = self.backend.devices_info()
-        #d.addCallback(self.got_devices_info)
-        self.got_devices_info(SAMPLE_DEVICES_INFO)
-
-    @log_call(logger.debug)
-    def got_devices_info(self, devices_info):
-        """Set the account info in all tabs."""
-        self.ui.devices_tab.update_devices_info(devices_info)
-
-    @log_call(logger.debug)
-    def got_account_info(self, account_info):
-        """Set the account info in all tabs."""
-        self.ui.profile_tab.update_account_info(account_info)
-        self.ui.services_tab.update_account_info(account_info)
+
+    # Invalid name "showEvent"
+    # pylint: disable=C0103
+
+    def showEvent(self, event):
+        """Load info."""
+        self.load()
+        event.accept()
+
+    @defer.inlineCallbacks
+    def load(self):
+        """Load info."""
+        info = yield self.backend.account_info()
+        self.process_info(info)
+
+    @log_call(logger.debug)
+    def process_info(self, info):
+        """Process and display the account info."""
+        # TODO: update storage usage
 
     @QtCore.pyqtSlot()
     def on_get_more_space_button_clicked(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/devices.py'
--- ubuntuone/controlpanel/gui/qt/devices.py	2011-06-20 22:21:30 +0000
+++ ubuntuone/controlpanel/gui/qt/devices.py	2011-06-21 22:49:26 +0000
@@ -24,7 +24,9 @@
 # pylint: disable=W0611
 from PyQt4 import QtGui, QtCore
 # pylint: enable=W0611
+from twisted.internet import defer
 
+from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import EDIT_DEVICES_LINK
 from ubuntuone.controlpanel.gui.qt import uri_hook
 from ubuntuone.controlpanel.gui.qt.ui import devices_ui
@@ -32,25 +34,43 @@
 from ubuntuone.controlpanel.gui.qt.device import DeviceWidget
 
 
+logger = setup_logging('qt.devices')
+
+
 class DevicesPanel(UbuntuOneBin):
     """The DevicesFolders Tab Panel widget"""
 
     title = _('All cloud-connected devices')
     ui_class = devices_ui
 
+    @defer.inlineCallbacks
     def load(self):
         """Load info."""
-        # request devices info
-
-    def update_local_device(self, device_info):
-        """Update the info for the local device."""
-        self.ui.device_name_label.setText(device_info["name"])
-
-    def create_remote_device(self, device_info):
-        """Add a remote device to the list."""
-        device_widget = DeviceWidget()
-        device_widget.update_device_info(device_info)
-        self.ui.devices_list_verticallayout.addWidget(device_widget)
+        self.is_processing = True
+        info = yield self.backend.device_names_info()
+        self.process_info(info)
+
+    @log_call(logger.debug)
+    def process_info(self, info):
+        """Process and display the devices info."""
+        self.clear_device_info(self.ui.local_device_box)
+        self.clear_device_info(self.ui.remote_devices_box)
+
+        for device_info in info:
+            self.update_device_info(device_info)
+
+        self.is_processing = False
+
+    def clear_device_info(self, box):
+        """Clear all the device info."""
+        children = box.count()
+        # we need to reverse the index list to remove children because:
+        # "Items are numbered consecutively from 0. If an item is deleted,
+        # other items will be renumbered."
+        # http://doc.qt.nokia.com/latest/qlayout.html#itemAt
+        for i in reversed(range(children)):
+            widget = box.itemAt(i).widget()
+            box.removeWidget(widget)
 
     def update_device_info(self, device_info):
         """Update one device."""
@@ -59,10 +79,17 @@
         else:
             self.create_remote_device(device_info)
 
-    def update_devices_info(self, devices_info):
-        """Update the list of devices in this panel."""
-        for device_info in devices_info:
-            self.update_device_info(device_info)
+    def update_local_device(self, device_info):
+        """Update the info for the local device."""
+        device_widget = DeviceWidget()
+        device_widget.update_device_info(device_info)
+        self.ui.local_device_box.addWidget(device_widget)
+
+    def create_remote_device(self, device_info):
+        """Add a remote device to the list."""
+        device_widget = DeviceWidget()
+        device_widget.update_device_info(device_info)
+        self.ui.remote_devices_box.addWidget(device_widget)
 
     @QtCore.pyqtSlot()
     def on_manage_devices_button_clicked(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2011-06-20 23:23:45 +0000
+++ ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2011-06-21 22:49:26 +0000
@@ -111,7 +111,7 @@
 
         self._backend_method = None
         self.backend = backend.ControlBackend()
-        self.backend.status_changed_handler = self.process_status
+        self.backend.status_changed_handler = self.process_info
 
         logger.debug('%s: started.', self.__class__.__name__)
 
@@ -127,18 +127,16 @@
     def load(self):
         """Load specific tab info."""
         info = yield self.backend.file_sync_status()
-        self.process_status(info)
+        self.process_info(info)
 
     @log_call(logger.debug)
-    def process_status(self, status):
+    def process_info(self, status):
         """Match status with signals."""
-        logger.debug('process_status: new status received %r', status)
-
         try:
             status_key = status[backend.STATUS_KEY]
             data = FILE_SYNC_STATUS[status_key]
         except (KeyError, TypeError):
-            logger.exception('process_status: received unknown status dict %r',
+            logger.exception('process_info: received unknown status dict %r',
                              status)
             return
 

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2011-06-20 22:59:31 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2011-06-21 22:49:26 +0000
@@ -102,7 +102,7 @@
         """Load specific tab info."""
         self.is_processing = True
         info = yield self.backend.volumes_info()
-        self.process_folders(info)
+        self.process_info(info)
 
     def humanize(self, int_bytes):
         """Return a human readable representation of 'int_bytes'.
@@ -128,15 +128,12 @@
         return result
 
     @log_call(logger.debug)
-    def process_folders(self, info):
+    def process_info(self, info):
         """Load folders info into the tree view."""
         self.ui.folders.clear()
         self._backend_folders = []
         self.is_processing = False
 
-        if not info:
-            return
-
         for name, free_bytes, volumes in info:
             if self.backend.NAME_NOT_SET in name:
                 name = NAME_NOT_SET

=== modified file 'ubuntuone/controlpanel/gui/qt/preferences.py'
--- ubuntuone/controlpanel/gui/qt/preferences.py	2011-06-20 22:59:31 +0000
+++ ubuntuone/controlpanel/gui/qt/preferences.py	2011-06-21 22:49:26 +0000
@@ -51,14 +51,11 @@
     def load(self):
         """Load info."""
         info = yield self.backend.file_sync_settings_info()
-        self.process_settings(info)
+        self.process_info(info)
 
     @log_call(logger.debug)
-    def process_settings(self, info):
+    def process_info(self, info):
         """Load settings info into the view."""
-        if not info:
-            return
-
         autoconnect = check_state(info[backend.AUTOCONNECT_KEY])
         show_all_notifs = \
             check_state(info[backend.SHOW_ALL_NOTIFICATIONS_KEY])
@@ -132,6 +129,6 @@
         yield self.backend.restore_file_sync_settings()
         settings = yield self.backend.file_sync_settings_info()
 
-        self.process_settings(settings)
+        self.process_info(settings)
 
         # unset is_processing

=== modified file 'ubuntuone/controlpanel/gui/qt/profile.py'
--- ubuntuone/controlpanel/gui/qt/profile.py	2011-06-20 22:21:30 +0000
+++ ubuntuone/controlpanel/gui/qt/profile.py	2011-06-21 22:49:26 +0000
@@ -22,28 +22,39 @@
 # pylint: disable=W0611
 from PyQt4 import QtGui, QtCore
 # pylint: enable=W0611
+from twisted.internet import defer
 
+from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import EDIT_PROFILE_LINK
 from ubuntuone.controlpanel.gui.qt import uri_hook
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import profile_ui
 
 
+logger = setup_logging('qt.profile')
+
+
 class ProfilePanel(UbuntuOneBin):
     """The Profile Tab Panel widget"""
 
     ui_class = profile_ui
 
+    @defer.inlineCallbacks
     def load(self):
         """Load info."""
-        # request account info
+        self.is_processing = True
+        info = yield self.backend.account_info()
+        self.process_info(info)
 
-    def update_account_info(self, account_info):
-        """Update the widgets with the account info."""
-        self.ui.fullname_lineedit.setText(account_info["name"])
-        self.ui.email_lineedit.setText(account_info["email"])
+    @log_call(logger.debug)
+    def process_info(self, info):
+        """Process and display the account info."""
+        self.ui.fullname_lineedit.setText(info["name"])
+        self.ui.email_lineedit.setText(info["email"])
         self.ui.password_lineedit.setText("swordfish")
 
+        self.is_processing = False
+
     @QtCore.pyqtSlot()
     def on_edit_profile_button_clicked(self):
         """The edit profile button was clicked."""

=== modified file 'ubuntuone/controlpanel/gui/qt/services.py'
--- ubuntuone/controlpanel/gui/qt/services.py	2011-06-20 22:21:30 +0000
+++ ubuntuone/controlpanel/gui/qt/services.py	2011-06-21 22:49:26 +0000
@@ -19,31 +19,41 @@
 """The user interface for the control panel for Ubuntu One."""
 
 from gettext import gettext as _
+from twisted.internet import defer
 
 # Unused import QtGui
 # pylint: disable=W0611
 from PyQt4 import QtGui, QtCore
 # pylint: enable=W0611
 
+from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import EDIT_ACCOUNT_LINK
 from ubuntuone.controlpanel.gui.qt import uri_hook
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import services_ui
 
 
+logger = setup_logging('qt.services')
+
+
 class ServicesPanel(UbuntuOneBin):
     """The ServicesFolders Tab Panel widget"""
 
     title = _('Selected plans and storage')
     ui_class = services_ui
 
+    @defer.inlineCallbacks
     def load(self):
         """Load info."""
-        # request account info
+        self.is_processing = True
+        info = yield self.backend.account_info()
+        self.process_info(info)
 
-    def update_account_info(self, account_info):
-        """Update the widgets with the account info."""
-        self.ui.storage_plan_label.setText(account_info["type"])
+    @log_call(logger.debug)
+    def process_info(self, info):
+        """Process and display the account info."""
+        self.ui.storage_plan_label.setText(info["type"])
+        self.is_processing = False
 
     @QtCore.pyqtSlot()
     def on_mobile_plan_modify_button_clicked(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2011-06-20 22:21:30 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2011-06-21 22:49:26 +0000
@@ -100,9 +100,11 @@
         backend.UPLOAD_KEY: -1,  # no limit
     }
 
+    next_result = object()
     exposed_methods = [
         'account_info',  # account
-        'devices_info', 'change_device_settings', 'remove_device',  # devices
+        'devices_info', 'device_names_info',  # devices
+        'change_device_settings', 'remove_device',
         'volumes_info', 'change_volume_settings',  # volumes
         'create_folder',
         'replications_info', 'change_replication_settings',  # replications

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2011-06-16 21:02:05 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2011-06-21 22:49:26 +0000
@@ -19,8 +19,7 @@
 """Tests for the Control Panel."""
 
 from ubuntuone.controlpanel.gui.qt import controlpanel as gui
-from ubuntuone.controlpanel.gui.qt.tests import (BaseTestCase, NO_OP,
-        SAMPLE_ACCOUNT_INFO, SAMPLE_DEVICES_INFO)
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
 
 
 class ControlPanelTestCase(BaseTestCase):
@@ -30,41 +29,11 @@
     innerclass_name = "Ui_Form"
     class_ui = gui.ControlPanel
 
-    def setUp(self):
-        """Initialize this test instance."""
-        self.patch(gui.ControlPanel, "get_account_info", NO_OP)
-        self.patch(gui.ControlPanel, "get_devices_info", NO_OP)
-        super(ControlPanelTestCase, self).setUp()
-
     def test_backend(self):
         """Backend is created."""
         self.assertIsInstance(self.ui.backend,
                               gui.backend.ControlBackend)
 
-    def test_got_account_info_updates_profile(self):
-        """Test the got_account_info method."""
-        self.patch(self.ui.ui.profile_tab, "update_account_info",
-                   self._set_called)
-        self.ui.got_account_info(SAMPLE_ACCOUNT_INFO)
-        expected = ((SAMPLE_ACCOUNT_INFO,), {})
-        self.assertEqual(self._called, expected)
-
-    def test_got_account_info_updates_services(self):
-        """Test the got_account_info method."""
-        self.patch(self.ui.ui.services_tab, "update_account_info",
-                   self._set_called)
-        self.ui.got_account_info(SAMPLE_ACCOUNT_INFO)
-        expected = ((SAMPLE_ACCOUNT_INFO,), {})
-        self.assertEqual(self._called, expected)
-
-    def test_got_devices_info_updates_devices(self):
-        """Test the got_device_info method."""
-        self.patch(self.ui.ui.devices_tab, "update_devices_info",
-                   self._set_called)
-        self.ui.got_devices_info(SAMPLE_DEVICES_INFO)
-        expected = ((SAMPLE_DEVICES_INFO,), {})
-        self.assertEqual(self._called, expected)
-
     def test_get_more_space_button(self):
         """When clicking the get more GB button, the proper url is opened."""
         self.patch(gui, 'uri_hook', self._set_called)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_devices.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-06-20 23:23:45 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-06-21 22:49:26 +0000
@@ -18,6 +18,8 @@
 
 """Tests for the devices tab."""
 
+from twisted.internet import defer
+
 from ubuntuone.controlpanel.gui.qt import devices as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     SAMPLE_DEVICES_INFO,
@@ -34,24 +36,61 @@
     innerclass_name = "Ui_Form"
     class_ui = gui.DevicesPanel
 
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(DevicesPanelTestCase, self).setUp()
+        self.ui.backend.next_result = SAMPLE_DEVICES_INFO
+
     def test_is_processing_while_asking_info(self):
         """The ui is processing while the contents are loaded."""
         def check():
             """The ui must be is_processing."""
             self.assertTrue(self.ui.is_processing, 'ui must be processing')
+            return SAMPLE_DEVICES_INFO
 
-        self.patch(self.ui.backend, 'devices_info', check)
+        self.patch(self.ui.backend, 'device_names_info', check)
 
         return self.ui.load()  # trigger the info request
 
-    def test_update_devices_info(self):
-        """The widget is updated with the info."""
-        container = self.ui.ui.devices_list_verticallayout
-        self.assertEqual(container.count(), 0)
-        self.ui.update_devices_info(SAMPLE_DEVICES_INFO)
-        expected_name = SAMPLE_DEVICES_INFO[0]["name"]
-        self.assertEqual(self.ui.ui.device_name_label.text(), expected_name)
-        self.assertEqual(container.count(), len(SAMPLE_DEVICES_INFO) - 1)
+    def test_is_not_processing_after_info_ready(self):
+        """The ui is not processing when contents are load."""
+        self.ui.process_info(SAMPLE_DEVICES_INFO)
+
+        self.assertFalse(self.ui.is_processing)
+
+    @defer.inlineCallbacks
+    def test_info_is_requested_on_load(self):
+        """The info is requested to the backend."""
+        yield self.ui.load()
+        self.assert_backend_called('device_names_info')
+
+    def test_no_devices_at_startup(self):
+        """The UI is reset at startup."""
+        self.assertEqual(self.ui.ui.remote_devices_box.count(), 0)
+        self.assertEqual(self.ui.ui.local_device_box.count(), 0)
+
+    def test_process_info(self):
+        """The widget is updated with the info."""
+        self.ui.process_info(SAMPLE_DEVICES_INFO)
+
+        local, remote = SAMPLE_DEVICES_INFO[0], SAMPLE_DEVICES_INFO[1:]
+
+        self.assertEqual(self.ui.ui.local_device_box.count(), 1)
+        local_device = self.ui.ui.local_device_box.itemAt(0)
+        self.assertEqual(local_device.widget().ui.device_name_label.text(),
+                         local['name'])
+
+        self.assertEqual(self.ui.ui.remote_devices_box.count(),
+                         len(remote))
+        for i, remote_device in enumerate(remote):
+            device = self.ui.ui.remote_devices_box.itemAt(i)
+            self.assertEqual(device.widget().ui.device_name_label.text(),
+                             remote_device['name'])
+
+    def test_process_info_twice(self):
+        """The widget is updated with the info."""
+        self.test_process_info()
+        self.test_process_info()
 
     def test_manage_devices_button(self):
         """Clicking the manage devices button opens the proper url."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2011-06-17 20:08:02 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2011-06-21 22:49:26 +0000
@@ -53,7 +53,7 @@
             expected_text = status_ui + ' (' + msg_bd + ')'
 
         status = {backend.STATUS_KEY: status_bd, backend.MSG_KEY: msg_bd}
-        self.ui.process_status(status)
+        self.ui.process_info(status)
 
         actual_text = self.ui.ui.sync_status_label.text()
         msg = '%r does not end with %r' % (actual_text, expected_text)
@@ -76,16 +76,16 @@
         self.assertIsInstance(self.ui.backend,
                               backend.ControlBackend)
 
-    def test_process_status_changed(self):
+    def test_process_info_changed(self):
         """Backend's file sync status changed callback is connected."""
         self.assertEqual(self.ui.backend.status_changed_handler,
-                         self.ui.process_status)
+                         self.ui.process_info)
 
-    def test_file_sync_status_is_requested_on_show(self):
+    def test_file_sync_status_is_requested_on_load(self):
         """The file sync status is requested to the backend."""
         self.assert_backend_called('file_sync_status')
 
-    def test_process_status_disabled(self):
+    def test_process_info_disabled(self):
         """File sync status disabled update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_DISABLED,
                                    status_ui=gui.FILE_SYNC_DISABLED,
@@ -93,7 +93,7 @@
                                    callback='enable_files',
                                    tooltip=gui.FILE_SYNC_ENABLE_TOOLTIP)
 
-    def test_process_status_disconnected(self):
+    def test_process_info_disconnected(self):
         """File sync status disconnected update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_DISCONNECTED,
                                    status_ui=gui.FILE_SYNC_DISCONNECTED,
@@ -101,7 +101,7 @@
                                    callback='connect_files',
                                    tooltip=gui.FILE_SYNC_CONNECT_TOOLTIP)
 
-    def test_process_status_error(self):
+    def test_process_info_error(self):
         """File sync status error update the label."""
         msg = gui.WARNING_MARKUP % gui.FILE_SYNC_ERROR
         self.assert_status_correct(status_bd=backend.FILE_SYNC_ERROR,
@@ -111,7 +111,7 @@
                                    callback='restart_files',
                                    tooltip=gui.FILE_SYNC_RESTART_TOOLTIP)
 
-    def test_process_status_idle(self):
+    def test_process_info_idle(self):
         """File sync status idle update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_IDLE,
                                    status_ui=gui.FILE_SYNC_IDLE,
@@ -119,7 +119,7 @@
                                    callback='disconnect_files',
                                    tooltip=gui.FILE_SYNC_DISCONNECT_TOOLTIP)
 
-    def test_process_status_starting(self):
+    def test_process_info_starting(self):
         """File sync status starting update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_STARTING,
                                    status_ui=gui.FILE_SYNC_STARTING,
@@ -127,7 +127,7 @@
                                    callback='stop_files',
                                    tooltip=gui.FILE_SYNC_STOP_TOOLTIP)
 
-    def test_process_status_stopped(self):
+    def test_process_info_stopped(self):
         """File sync status stopped update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_STOPPED,
                                    status_ui=gui.FILE_SYNC_STOPPED,
@@ -135,7 +135,7 @@
                                    callback='start_files',
                                    tooltip=gui.FILE_SYNC_START_TOOLTIP)
 
-    def test_process_status_syncing(self):
+    def test_process_info_syncing(self):
         """File sync status syncing update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_SYNCING,
                                    status_ui=gui.FILE_SYNC_SYNCING,
@@ -143,7 +143,7 @@
                                    callback='disconnect_files',
                                    tooltip=gui.FILE_SYNC_DISCONNECT_TOOLTIP)
 
-    def test_process_status_unknown(self):
+    def test_process_info_unknown(self):
         """File sync status unknown update the label."""
         msg = gui.WARNING_MARKUP % gui.FILE_SYNC_ERROR
         self.assert_status_correct(status_bd=backend.FILE_SYNC_UNKNOWN,

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-06-21 14:43:31 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-06-21 22:49:26 +0000
@@ -55,6 +55,8 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(FoldersPanelTestCase, self).setUp()
+        self.ui.backend.next_result = FAKE_VOLUMES_MINIMAL_INFO
+
         self.memento = MementoHandler()
         self.memento.setLevel(logging.DEBUG)
         gui.logger.addHandler(self.memento)
@@ -78,6 +80,7 @@
         def check():
             """The ui must be is_processing."""
             self.assertTrue(self.ui.is_processing, 'ui must be processing')
+            return FAKE_VOLUMES_MINIMAL_INFO
 
         self.patch(self.ui.backend, 'volumes_info', check)
 
@@ -85,17 +88,17 @@
 
     def test_is_not_processing_after_info_ready(self):
         """The ui is not processing when contents are load."""
-        self.ui.process_folders(FAKE_VOLUMES_INFO)
+        self.ui.process_info(FAKE_VOLUMES_INFO)
 
         self.assertFalse(self.ui.is_processing)
 
-    def test_volumes_info_is_requested_on_show(self):
+    def test_info_is_requested_on_load(self):
         """The volumes info is requested to the backend."""
         self.assert_backend_called('volumes_info')
 
-    def test_process_folders(self):
+    def test_process_info(self):
         """The volumes info is processed when ready."""
-        self.ui.process_folders(FAKE_VOLUMES_INFO)
+        self.ui.process_info(FAKE_VOLUMES_INFO)
         folders = self.ui.ui.folders
 
         root = folders.invisibleRootItem()
@@ -166,24 +169,24 @@
                 # skip the empty row
                 treeiter += 1
 
-    def test_process_folders_clears_the_list(self):
+    def test_process_info_clears_the_list(self):
         """The old volumes info is cleared before updated."""
-        self.ui.process_folders(FAKE_VOLUMES_INFO)
-        self.ui.process_folders(FAKE_VOLUMES_INFO)
+        self.ui.process_info(FAKE_VOLUMES_INFO)
+        self.ui.process_info(FAKE_VOLUMES_INFO)
 
         root = self.ui.ui.folders.invisibleRootItem()
         self.assertEqual(len(FAKE_VOLUMES_INFO) + 1, root.childCount())
 
-    def test_process_folders_with_no_volumes(self):
+    def test_process_info_with_no_volumes(self):
         """When there are no volumes, a notification is shown."""
-        self.ui.process_folders([])
+        self.ui.process_info([])
 
         root = self.ui.ui.folders.invisibleRootItem()
         self.assertEqual(root.childCount(), 0)
 
-    def test_process_folders_highlights_little_free_space(self):
+    def test_process_info_highlights_little_free_space(self):
         """The free space is red if is zero (or close to 0)."""
-        self.ui.process_folders(FAKE_VOLUMES_NO_FREE_SPACE_INFO)
+        self.ui.process_info(FAKE_VOLUMES_NO_FREE_SPACE_INFO)
         folders = self.ui.ui.folders
 
         child_index = 0
@@ -208,7 +211,7 @@
                 self.assertTrue(item.is_empty)
                 child_index += 1
 
-    def test_process_folders_handles_no_quota_info(self):
+    def test_process_info_handles_no_quota_info(self):
         """The lack of free space is handled."""
         info = [
             (u'', self.ui.backend.FREE_BYTES_NOT_AVAILABLE, [ROOT]),
@@ -218,7 +221,7 @@
                u'path': u'full-share', u'subscribed': u'',
                u'type': self.ui.backend.SHARE_TYPE}]),
         ]
-        self.ui.process_folders(info)
+        self.ui.process_info(info)
         folders = self.ui.ui.folders
 
         child_index = 0
@@ -279,9 +282,9 @@
         self.assertTrue(self.memento.check_warning(path, 'does not exist'))
         self.assertEqual(self._called, False)
 
-    def test_process_folders_with_music_folder(self):
+    def test_process_info_with_music_folder(self):
         """The volumes info is processed when ready."""
-        self.ui.process_folders(FAKE_VOLUMES_MINIMAL_INFO)
+        self.ui.process_info(FAKE_VOLUMES_MINIMAL_INFO)
         folders = self.ui.ui.folders
 
         treeiter = gui.QtGui.QTreeWidgetItemIterator(folders)
@@ -323,7 +326,7 @@
     def setUp(self):
         yield super(FoldersPanelAddFolderTestCase, self).setUp()
         # simulate volumes info properly processed
-        self.ui.process_folders([])
+        self.ui.process_info([])
         # reset backend state
         self.ui.backend._called.clear()
 
@@ -384,7 +387,7 @@
     @defer.inlineCallbacks
     def test_opens_warning_if_folder_inside_root(self):
         """If the user chooses a folder inside the root, show a warning."""
-        self.ui.process_folders(FAKE_VOLUMES_MINIMAL_INFO)
+        self.ui.process_info(FAKE_VOLUMES_MINIMAL_INFO)
         root_path = ROOT['path']
         # create a valid path inside the root
         inside_root = os.path.abspath(os.path.join(root_path, 'test'))
@@ -403,7 +406,7 @@
     @defer.inlineCallbacks
     def test_opens_warning_if_folder_inside_an_udf(self):
         """If the user chooses a folder inside an UDF, show a warning."""
-        self.ui.process_folders(FAKE_VOLUMES_MINIMAL_INFO)
+        self.ui.process_info(FAKE_VOLUMES_MINIMAL_INFO)
         udf_path = MUSIC_FOLDER['path']
         # create a valid path inside an existing UDF
         inside_udf = os.path.abspath(os.path.join(udf_path, 'test'))
@@ -427,7 +430,7 @@
         outside every UDF, do not show a warning and call backend.
 
         """
-        self.ui.process_folders(FAKE_VOLUMES_MINIMAL_INFO)
+        self.ui.process_info(FAKE_VOLUMES_MINIMAL_INFO)
         tricky_path = ROOT['path']
         assert not tricky_path.endswith(os.path.sep)
         tricky_path += ' Suffix'
@@ -510,7 +513,7 @@
         FakedConfirmDialog.kwargs = None
         self.patch(gui.QtGui, 'QMessageBox', FakedConfirmDialog)
 
-        self.ui.process_folders(FAKE_VOLUMES_MINIMAL_INFO)
+        self.ui.process_info(FAKE_VOLUMES_MINIMAL_INFO)
         # the music folder
         self.item = self.ui.ui.folders.topLevelItem(0).child(1)
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2011-05-28 00:45:18 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2011-06-21 22:49:26 +0000
@@ -19,7 +19,7 @@
 """Tests for the Qt UI."""
 
 from ubuntuone.controlpanel.gui.qt import gui
-from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase, NO_OP
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
 
 
 class MainWindowTestCase(BaseTestCase):
@@ -29,11 +29,6 @@
     innerclass_name = "Ui_MainWindow"
     class_ui = gui.MainWindow
 
-    def setUp(self):
-        """Initialize this test instance."""
-        self.patch(gui.mainwindow_ui.ControlPanel, "get_account_info", NO_OP)
-        super(MainWindowTestCase, self).setUp()
-
     def test_close_event_calls_custom_close_callback(self):
         """When closing the window, close_callback is called."""
         self.ui.close_callback = self._set_called

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_preferences.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_preferences.py	2011-06-20 23:23:45 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_preferences.py	2011-06-21 22:49:26 +0000
@@ -30,6 +30,15 @@
 # Access to a protected member
 # pylint: disable=W0212
 
+SAMPLE_SETTINGS = {
+    gui.backend.AUTOCONNECT_KEY: True,
+    gui.backend.SHOW_ALL_NOTIFICATIONS_KEY: True,
+    gui.backend.SHARE_AUTOSUBSCRIBE_KEY: True,
+    gui.backend.UDF_AUTOSUBSCRIBE_KEY: True,
+    gui.backend.DOWNLOAD_KEY: 20480,
+    gui.backend.UPLOAD_KEY: 2048,
+}
+
 
 class PreferencesPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt cloud preferences tab."""
@@ -41,6 +50,7 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(PreferencesPanelTestCase, self).setUp()
+        self.ui.backend.next_result = SAMPLE_SETTINGS
         yield self.ui.load()
 
     def test_is_processing_while_asking_info(self):
@@ -53,8 +63,8 @@
 
         yield self.ui.load()  # trigger the info request
 
-    def test_file_sync_settings_info_is_requested(self):
-        """The file_sync_settings info is requested to the backend."""
+    def test_info_is_requested_on_load(self):
+        """The info is requested to the backend."""
         self.assert_backend_called('file_sync_settings_info')
 
     def _test_update_ui_from_settings_info(self, settings):
@@ -87,16 +97,8 @@
 
     def test_update_ui_from_backed_info(self):
         """The ui is correctly updated when the backend info is received."""
-        settings = {
-            gui.backend.AUTOCONNECT_KEY: True,
-            gui.backend.SHOW_ALL_NOTIFICATIONS_KEY: True,
-            gui.backend.SHARE_AUTOSUBSCRIBE_KEY: True,
-            gui.backend.UDF_AUTOSUBSCRIBE_KEY: True,
-            gui.backend.DOWNLOAD_KEY: 20480,
-            gui.backend.UPLOAD_KEY: 2048,
-        }
-        self.ui.process_settings(settings)
-        self._test_update_ui_from_settings_info(settings)
+        self.ui.process_info(SAMPLE_SETTINGS)
+        self._test_update_ui_from_settings_info(SAMPLE_SETTINGS)
 
     def _test_speed_checkbox_value_changed_to_positive(self, speed_spinbox,
                                                        limit_checkbox):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_profile.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_profile.py	2011-06-20 23:23:45 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_profile.py	2011-06-21 22:49:26 +0000
@@ -18,6 +18,8 @@
 
 """Tests for the profile tab."""
 
+from twisted.internet import defer
+
 from ubuntuone.controlpanel.gui.qt import profile as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     SAMPLE_ACCOUNT_INFO, SAMPLE_EMAIL, SAMPLE_NAME,
@@ -34,19 +36,37 @@
     innerclass_name = "Ui_Form"
     class_ui = gui.ProfilePanel
 
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(ProfilePanelTestCase, self).setUp()
+        self.ui.backend.next_result = SAMPLE_ACCOUNT_INFO
+
     def test_is_processing_while_asking_info(self):
         """The ui is processing while the contents are loaded."""
         def check():
             """The ui must be is_processing."""
             self.assertTrue(self.ui.is_processing, 'ui must be processing')
+            return SAMPLE_ACCOUNT_INFO
 
         self.patch(self.ui.backend, 'account_info', check)
 
         return self.ui.load()  # trigger the info request
 
-    def test_update_account_info(self):
+    def test_is_not_processing_after_info_ready(self):
+        """The ui is not processing when contents are load."""
+        self.ui.process_info(SAMPLE_ACCOUNT_INFO)
+
+        self.assertFalse(self.ui.is_processing)
+
+    @defer.inlineCallbacks
+    def test_info_is_requested_on_load(self):
+        """The info is requested to the backend."""
+        yield self.ui.load()
+        self.assert_backend_called('account_info')
+
+    def test_process_info(self):
         """Backend's file sync status changed callback is connected."""
-        self.ui.update_account_info(SAMPLE_ACCOUNT_INFO)
+        self.ui.process_info(SAMPLE_ACCOUNT_INFO)
         self.assertEqual(self.ui.ui.fullname_lineedit.text(), SAMPLE_NAME)
         self.assertEqual(self.ui.ui.email_lineedit.text(), SAMPLE_EMAIL)
         self.assertEqual(self.ui.ui.password_lineedit.text(), "swordfish")

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_services.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_services.py	2011-06-20 23:23:45 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_services.py	2011-06-21 22:49:26 +0000
@@ -18,6 +18,8 @@
 
 """Tests for the services tab."""
 
+from twisted.internet import defer
+
 from ubuntuone.controlpanel.gui.qt import services as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     SAMPLE_ACCOUNT_INFO, SAMPLE_PLAN,
@@ -34,19 +36,37 @@
     innerclass_name = "Ui_Form"
     class_ui = gui.ServicesPanel
 
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(ServicesPanelTestCase, self).setUp()
+        self.ui.backend.next_result = SAMPLE_ACCOUNT_INFO
+
     def test_is_processing_while_asking_info(self):
         """The ui is processing while the contents are loaded."""
         def check():
             """The ui must be is_processing."""
             self.assertTrue(self.ui.is_processing, 'ui must be processing')
+            return SAMPLE_ACCOUNT_INFO
 
         self.patch(self.ui.backend, 'account_info', check)
 
         return self.ui.load()  # trigger the info request
 
-    def test_update_account_info(self):
+    def test_is_not_processing_after_info_ready(self):
+        """The ui is not processing when contents are load."""
+        self.ui.process_info(SAMPLE_ACCOUNT_INFO)
+
+        self.assertFalse(self.ui.is_processing)
+
+    @defer.inlineCallbacks
+    def test_info_is_requested_on_load(self):
+        """The info is requested to the backend."""
+        yield self.ui.load()
+        self.assert_backend_called('account_info')
+
+    def test_process_info(self):
         """Backend's file sync status changed callback is connected."""
-        self.ui.update_account_info(SAMPLE_ACCOUNT_INFO)
+        self.ui.process_info(SAMPLE_ACCOUNT_INFO)
         self.assertEqual(self.ui.ui.storage_plan_label.text(), SAMPLE_PLAN)
 
     def test_mobile_plan_modify_button(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py	2011-06-21 14:43:31 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py	2011-06-21 22:49:26 +0000
@@ -30,10 +30,6 @@
 
     class_ui = gui.UbuntuOneBin
 
-    def setUp(self):
-        super(UbuntuOneBinTestCase, self).setUp()
-        self.ui.show()  # need to show to test widgets visibility
-
     def test_backend(self):
         """Backend is created."""
         self.assertIsInstance(self.ui.backend,
@@ -61,13 +57,19 @@
 
     def test_is_enabled_if_not_processing(self):
         """If not processing, the UI is enabled."""
+        self.ui.show()  # need to show to test widgets visibility
+
         self.ui.is_processing = False
+
         self.assertTrue(self.ui.isEnabled())
         self.assertFalse(self.ui.bin_ui.spinner.isVisible())
 
     def test_is_not_enabled_if_processing(self):
         """If processing, the UI is disabled."""
+        self.ui.show()  # need to show to test widgets visibility
+
         self.ui.is_processing = True
+
         self.assertFalse(self.ui.isEnabled())
         self.assertTrue(self.ui.bin_ui.spinner.isVisible())
 

=== modified file 'ubuntuone/controlpanel/gui/tests/__init__.py'
--- ubuntuone/controlpanel/gui/tests/__init__.py	2011-06-01 21:18:46 +0000
+++ ubuntuone/controlpanel/gui/tests/__init__.py	2011-06-21 22:49:26 +0000
@@ -116,6 +116,7 @@
 class FakedObject(object):
     """Fake an object, record every call."""
 
+    next_result = None
     exposed_methods = []
 
     def __init__(self, *args, **kwargs):
@@ -131,5 +132,6 @@
         def inner(*args, **kwargs):
             """Fake 'func_name'."""
             self._called[func_name] = (args, kwargs)
+            return self.next_result
 
         return inner