Merge lp:~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.9.6 into lp:ubuntu/natty/ubuntuone-control-panel

[Natalia Bidart]

  * New upstream release.
    [ Natalia B. Bidart <email address hidden> ]
      - Free bytes will not be displayed in the UI for read-only shares.
      Also, backend now handles quota info not available for the root folder
      (LP: #726580).
      - Setting the unity's urgent prop only if available (LP: #755185).
      - Made panel title selectable. Tab messages are now also selectable
      (LP: #757543).
      - Highlight with red and bold when free space available is very little
      (either in own volumes or shares) (LP: #753989).

  * debian/control:
    - bump depends versions for ubuntuone-client (>= 1.6.0) and
    ubuntu-sso-client (>= 1.2.0).

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-04-08 16:07:22 +0000
+++ PKG-INFO	2011-04-12 16:04:35 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntuone-control-panel
-Version: 0.9.5
+Version: 0.9.6
 Summary: Ubuntu One Control Panel
 Home-page: https://launchpad.net/ubuntuone-control-panel
 Author: Natalia Bidart

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-08 20:23:32 +0000
+++ debian/changelog	2011-04-12 16:04:35 +0000
@@ -1,3 +1,23 @@
+ubuntuone-control-panel (0.9.6-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+    [ Natalia B. Bidart <[e-mail]> ]
+      - Free bytes will not be displayed in the UI for read-only shares.
+      Also, backend now handles quota info not available for the root folder
+      (LP: #726580).
+      - Setting the unity's urgent prop only if available (LP: #755185).
+      - Made panel title selectable. Tab messages are now also selectable
+      (LP: #757543).
+      - Highlight with red and bold when free space available is very little
+      (either in own volumes or shares) (LP: #753989).
+
+  * debian/control:
+    - bump depends versions for ubuntuone-client (>= 1.6.0) and
+    ubuntu-sso-client (>= 1.2.0).
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Tue, 12 Apr 2011 12:11:11 -0300
+
 ubuntuone-control-panel (0.9.5-0ubuntu1) natty; urgency=low
 
   * New upstream release:

=== modified file 'debian/control'
--- debian/control	2011-03-10 03:09:16 +0000
+++ debian/control	2011-04-12 16:04:35 +0000
@@ -17,7 +17,7 @@
  ${python:Depends},
  python,
  python-ubuntuone-control-panel (= ${binary:Version}),
- ubuntuone-client (>= 1.5.6),
+ ubuntuone-client (>= 1.6.0),
 Recommends: ubuntuone-control-panel-gui
 Description: Ubuntu One Control Panel
  Desktop application to manage a Ubuntu One account.
@@ -37,8 +37,8 @@
  python-simplejson,
  python-twisted-core,
  python-twisted-web,
- python-ubuntuone-client (>= 1.5.6),
- ubuntu-sso-client (>= 1.1.11),
+ python-ubuntuone-client (>= 1.6.0),
+ ubuntu-sso-client (>= 1.2.0),
 Description: Ubuntu One Control Panel Python Libraries
  Ubuntu One Control Panel provides a Python library to manage an Ubuntu One
  account.
@@ -54,9 +54,9 @@
  python-defer,
  python-gobject,
  python-gtk2,
- python-ubuntuone-client (>= 1.5.6),
- ubuntu-sso-client (>= 1.1.11),
- ubuntuone-client (>= 1.5.6),
+ python-ubuntuone-client (>= 1.6.0),
+ ubuntu-sso-client (>= 1.2.0),
+ ubuntuone-client (>= 1.6.0),
  ubuntuone-control-panel (= ${binary:Version}),
 Provides: ubuntuone-control-panel-gui
 Description: Ubuntu One Control Panel

=== modified file 'setup.py'
--- setup.py	2011-04-08 16:07:22 +0000
+++ setup.py	2011-04-12 16:04:35 +0000
@@ -79,7 +79,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-control-panel',
-    version='0.9.5',
+    version='0.9.6',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-04-08 16:07:22 +0000
+++ ubuntuone/controlpanel/backend.py	2011-04-12 16:04:35 +0000
@@ -100,6 +100,7 @@
     FOLDER_TYPE = u'UDF'
     SHARE_TYPE = u'SHARE'
     NAME_NOT_SET = u'ENAMENOTSET'
+    FREE_BYTES_NOT_AVAILABLE = u'EFREEBYTESNOTAVAILABLE'
     STATUS_DISABLED = {MSG_KEY: '', STATUS_KEY: FILE_SYNC_DISABLED}
 
     def __init__(self, shutdown_func=None):
@@ -450,14 +451,21 @@
         """Get the volumes info."""
         self._volumes = {}
 
-        account = yield self.account_info()
+        try:
+            account = yield self.account_info()
+        except Exception:  # pylint: disable=W0703
+            logger.exception('volumes_info: quota could not be retrieved:')
+            free_bytes = self.FREE_BYTES_NOT_AVAILABLE
+        else:
+            free_bytes = int(account['quota_total']) - \
+                         int(account['quota_used'])
+
         root_dir = yield dbus_client.get_root_dir()
         shares_dir = yield dbus_client.get_shares_dir()
         shares_dir_link = yield dbus_client.get_shares_dir_link()
         folders = yield dbus_client.get_folders()
         shares = yield dbus_client.get_shares()
 
-        free_bytes = int(account['quota_total']) - int(account['quota_used'])
         root_volume = {u'volume_id': u'', u'path': root_dir,
                        u'subscribed': 'True', u'type': self.ROOT_TYPE}
         self._volumes[u''] = root_volume
@@ -465,15 +473,17 @@
         # group shares by the offering user
         shares_result = defaultdict(list)
         for share in shares:
+            if not bool(share['accepted']):
+                continue
+
             share[u'type'] = self.SHARE_TYPE
 
             vid = share['volume_id']
-            assert vid not in self._volumes
+            if vid in self._volumes:
+                logger.warning('volumes_info: share %r already in the volumes '
+                               'list (%r).', vid, self._volumes[vid])
             self._volumes[vid] = share
 
-            if not bool(share['accepted']):
-                continue
-
             nicer_path = share[u'path'].replace(shares_dir, shares_dir_link)
             share[u'path'] = nicer_path
 
@@ -488,13 +498,20 @@
             folder[u'type'] = self.FOLDER_TYPE
 
             vid = folder['volume_id']
-            assert vid not in self._volumes
+            if vid in self._volumes:
+                logger.warning('volumes_info: udf %r already in the volumes '
+                               'list (%r).', vid, self._volumes[vid])
             self._volumes[vid] = folder
 
         result = [(u'', unicode(free_bytes), [root_volume] + folders)]
 
         for other_username, shares in shares_result.iteritems():
-            result.append((other_username, shares[0][u'free_bytes'], shares))
+            send_freebytes = any(s['access_level'] == 'Modify' for s in shares)
+            if send_freebytes:
+                free_bytes = shares[0][u'free_bytes']
+            else:
+                free_bytes = self.FREE_BYTES_NOT_AVAILABLE
+            result.append((other_username, free_bytes, shares))
 
         returnValue(result)
 

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-04-08 16:07:22 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-04-12 16:04:35 +0000
@@ -456,7 +456,7 @@
               'this computer')
     MY_FOLDERS = _('My folders')
     ALWAYS_SUBSCRIBED = _('Always in sync!')
-    FREE_SPACE = _('%(free_space)s available storage')
+    FREE_SPACE_TEXT = _('%(free_space)s available storage')
     NO_VOLUMES = _('No folders to show.')
     NAME_NOT_SET = _('[unknown user name]')
     CONFIRM_MERGE = _('The contents of your cloud folder will be merged with '
@@ -466,13 +466,15 @@
     MUSIC_REAL_PATH = '~/.ubuntuone/Purchased from Ubuntu One'
 
     MAX_COLS = 8
+    MIN_SIZE_FULL = 1048576
 
     CONTACT_ICON_NAME = 'avatar-default'
     FOLDER_ICON_NAME = 'folder'
     SHARE_ICON_NAME = 'folder-remote'
     MUSIC_ICON_NAME = 'audio-x-generic'
-    ROW_HEADER = '<span font_size="large"><b>%s</b></span> ' \
-                 '<span foreground="grey">%s</span>'
+    FREE_SPACE = '<span foreground="grey">%s</span>' % FREE_SPACE_TEXT
+    NO_FREE_SPACE = '<span foreground="red"><b>%s</b></span>' % FREE_SPACE_TEXT
+    ROW_HEADER = '<span font_size="large"><b>%s</b></span> %s'
     ROOT = '%s - <span foreground="%s" font_size="small">%s</span>'
 
     def __init__(self, main_window=None):
@@ -534,12 +536,28 @@
             else:
                 name = self.MY_FOLDERS
 
-            free_bytes_args = {'free_space': self.humanize(int(free_bytes))}
-            row = (self.ROW_HEADER % (name, self.FREE_SPACE % free_bytes_args),
+            scroll_to_cell = False
+            if free_bytes == backend.ControlBackend.FREE_BYTES_NOT_AVAILABLE:
+                free_bytes = ''
+            else:
+                free_bytes = int(free_bytes)
+                if free_bytes < self.MIN_SIZE_FULL:
+                    free_bytes_str = self.NO_FREE_SPACE
+                    scroll_to_cell = True
+                else:
+                    free_bytes_str = self.FREE_SPACE
+                free_bytes_args = {'free_space': self.humanize(free_bytes)}
+                free_bytes = free_bytes_str % free_bytes_args
+
+            row = (self.ROW_HEADER % (name, free_bytes),
                    True, self.CONTACT_ICON_NAME, False, False,
                    gtk.ICON_SIZE_LARGE_TOOLBAR, None, None)
             treeiter = self.volumes_store.append(None, row)
 
+            if scroll_to_cell:
+                path = self.volumes_store.get_string_from_iter(treeiter)
+                self.volumes_view.scroll_to_cell(path)
+
             volumes.sort(key=operator.itemgetter('path'))
             for volume in volumes:
                 sensitive = True
@@ -1722,7 +1740,7 @@
         if not USE_LIBUNITY:
             return
         entry = Unity.LauncherEntry.get_for_desktop_id(U1_DOTDESKTOP)
-        if entry.props.urgent:
+        if getattr(entry.props, 'urgent', False):
             self.switch_to('volumes')
             entry.props.urgent = False
 

=== modified file 'ubuntuone/controlpanel/gtk/tests/__init__.py'
--- ubuntuone/controlpanel/gtk/tests/__init__.py	2011-04-08 16:07:22 +0000
+++ ubuntuone/controlpanel/gtk/tests/__init__.py	2011-04-12 16:04:35 +0000
@@ -68,7 +68,6 @@
     {u'volume_id': u'1234', u'name': u'do',
      u'path': u'/home/tester/.local/share/ubuntuone/shares/do from Other User',
      u'subscribed': u'', u'type': ControlBackend.SHARE_TYPE},
-
     {u'volume_id': u'5678', u'name': u're',
      u'path': u'/home/tester/.local/share/ubuntuone/shares/re from Other User',
      u'subscribed': u'True', u'type': ControlBackend.SHARE_TYPE},
@@ -76,7 +75,17 @@
 
 FAKE_VOLUMES_INFO = [
     (u'', u'147852369', [ROOT] + FAKE_FOLDERS_INFO),
-    (u'Other User', u'985674', FAKE_SHARES_INFO),
+    (u'Other User', gui.VolumesPanel.MIN_SIZE_FULL, FAKE_SHARES_INFO),
+]
+
+FAKE_VOLUMES_NO_FREE_SPACE_INFO = [
+    (u'', u'500', [ROOT]),
+    (u'No free space', u'0',
+     [{u'volume_id': u'0', u'name': u'full', u'path': u'full-share',
+       u'subscribed': u'', u'type': ControlBackend.SHARE_TYPE}]),
+    (u'Almost no free space', gui.VolumesPanel.MIN_SIZE_FULL - 1,
+     [{u'volume_id': u'1', u'name': u'almostfull', u'path': u'almost-full',
+       u'subscribed': u'', u'type': ControlBackend.SHARE_TYPE}]),
 ]
 
 FAKE_DEVICE_INFO = {

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-04-08 16:07:22 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-04-12 16:04:35 +0000
@@ -23,7 +23,7 @@
 from ubuntuone.controlpanel.gtk import gui
 from ubuntuone.controlpanel.gtk.tests import (FAKE_ACCOUNT_INFO,
     FAKE_DEVICE_INFO, FAKE_DEVICES_INFO, FAKE_FOLDERS_INFO,
-    FAKE_VOLUMES_INFO, FAKE_REPLICATIONS_INFO,
+    FAKE_VOLUMES_INFO, FAKE_VOLUMES_NO_FREE_SPACE_INFO, FAKE_REPLICATIONS_INFO,
     MUSIC_FOLDER, ROOT, USER_HOME,
     FakedConfirmDialog,
 )
@@ -260,6 +260,66 @@
 
         self.assertEqual(len(self.ui.volumes_store), 0)
 
+    def test_on_volumes_info_ready_highlights_little_free_space(self):
+        """The free space is red if is zero (or close to 0)."""
+        self.ui.on_volumes_info_ready(FAKE_VOLUMES_NO_FREE_SPACE_INFO)
+
+        treeiter = self.ui.volumes_store.get_iter_root()
+        for name, free_bytes, volumes in FAKE_VOLUMES_NO_FREE_SPACE_INFO:
+            name = "%s's" % name if name else self.ui.MY_FOLDERS
+            free_bytes = self.ui.humanize(int(free_bytes))
+            free_bytes = self.ui.NO_FREE_SPACE % {'free_space': free_bytes}
+
+            # check parent row
+            row = self.ui.volumes_store.get(treeiter,
+                                            *xrange(self.ui.MAX_COLS))
+
+            self.assertEqual(row[0], self.ui.ROW_HEADER % (name, free_bytes))
+
+            treeiter = self.ui.volumes_store.iter_next(treeiter)
+
+            if treeiter is not None:
+                # skip the empty row
+                row = self.ui.volumes_store.get(treeiter,
+                                                *xrange(self.ui.MAX_COLS))
+                self.assertEqual(row, self.ui._empty_row)
+
+                # grab next non-empty row
+                treeiter = self.ui.volumes_store.iter_next(treeiter)
+
+    def test_on_volumes_info_ready_handles_no_quota_info(self):
+        """The lack of free space is handled."""
+        info = [
+            (u'', gui.backend.ControlBackend.FREE_BYTES_NOT_AVAILABLE, [ROOT]),
+            (u'No free space available',
+             gui.backend.ControlBackend.FREE_BYTES_NOT_AVAILABLE,
+             [{u'volume_id': u'0', u'name': u'full',
+               u'path': u'full-share', u'subscribed': u'',
+               u'type': gui.backend.ControlBackend.SHARE_TYPE}]),
+        ]
+        self.ui.on_volumes_info_ready(info)
+
+        treeiter = self.ui.volumes_store.get_iter_root()
+        for name, free_bytes, volumes in info:
+            name = "%s's" % name if name else self.ui.MY_FOLDERS
+
+            # check parent row
+            row = self.ui.volumes_store.get(treeiter,
+                                            *xrange(self.ui.MAX_COLS))
+
+            self.assertEqual(row[0], self.ui.ROW_HEADER % (name, ''))
+
+            treeiter = self.ui.volumes_store.iter_next(treeiter)
+
+            if treeiter is not None:
+                # skip the empty row
+                row = self.ui.volumes_store.get(treeiter,
+                                                *xrange(self.ui.MAX_COLS))
+                self.assertEqual(row, self.ui._empty_row)
+
+                # grab next non-empty row
+                treeiter = self.ui.volumes_store.iter_next(treeiter)
+
     def test_on_volumes_info_error(self):
         """The volumes info couldn't be retrieved."""
         self.ui.on_volumes_info_error()

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-04-08 16:07:22 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-04-12 16:04:35 +0000
@@ -143,7 +143,7 @@
         THE_FLEP.urgent = True
         self.patch(gui.Unity, "LauncherEntry", FakeLauncherEntry)
         cp = gui.ControlPanelWindow()
-        cp.emit('focus-in-event', None)
+        cp.emit('focus-in-event', gui.gtk.gdk.Event(gui.gtk.gdk.FOCUS_CHANGE))
         self.assertEqual(
             False, THE_FLEP.urgent, 'remove_urgency should have been called.')
 

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_widgets.py'
--- ubuntuone/controlpanel/gtk/tests/test_widgets.py	2011-03-23 16:06:41 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_widgets.py	2011-04-12 16:04:35 +0000
@@ -148,6 +148,10 @@
         actual = widget.loading.spinner.style.fg[widgets.gtk.STATE_NORMAL]
         self.assertEqual(actual, widgets.gtk.gdk.Color(expected))
 
+    def test_selectable(self):
+        """The widget is selectable."""
+        self.assertTrue(self.widget.label.get_selectable())
+
 
 class PanelTitleTestCase(TestCase):
     """Tets case for a special title for each management panel."""
@@ -186,3 +190,7 @@
         """The label padding is correct."""
         self.assertEqual(self.widget.get_padding(),
                          widgets.DEFAULT_PADDING)
+
+    def test_selectable(self):
+        """The widget is selectable."""
+        self.assertTrue(self.widget.get_selectable())

=== modified file 'ubuntuone/controlpanel/gtk/widgets.py'
--- ubuntuone/controlpanel/gtk/widgets.py	2011-03-23 16:06:41 +0000
+++ ubuntuone/controlpanel/gtk/widgets.py	2011-04-12 16:04:35 +0000
@@ -55,6 +55,7 @@
         self.loading = Loading(loading_label, fg_color=fg_color)
 
         self.label = gtk.Label()
+        self.label.set_selectable(True)
         self.label.show()
         if fg_color is not None:
             self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.Color(fg_color))
@@ -113,6 +114,7 @@
         self.set_property('xalign', 0.0)
         self.set_line_wrap(True)
         self.set_line_wrap_mode(pango.WRAP_WORD)
+        self.set_selectable(True)
         self.show_all()
 
 

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2011-04-08 16:07:22 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2011-04-12 16:04:35 +0000
@@ -24,7 +24,7 @@
 import simplejson
 
 from twisted.internet import defer
-from twisted.internet.defer import inlineCallbacks
+from twisted.internet.defer import inlineCallbacks, returnValue
 from ubuntuone.devtools.handlers import MementoHandler
 
 from ubuntuone.controlpanel import backend, replication_client
@@ -98,6 +98,8 @@
     subscribed_folders = []
     subscribed_shares = []
     actions = []
+    shares = []
+    folders = []
 
     def get_credentials(self):
         """Return the mock credentials."""
@@ -179,7 +181,7 @@
 
     def get_folders(self):
         """Grab list of folders."""
-        return SAMPLE_FOLDERS
+        return MockDBusClient.folders
 
     def subscribe_folder(self, volume_id):
         """Subcribe to 'volume_id'."""
@@ -191,7 +193,7 @@
 
     def get_shares(self):
         """Grab list of shares."""
-        return SAMPLE_SHARES
+        return MockDBusClient.shares
 
     def subscribe_share(self, volume_id):
         """Subcribe to 'volume_id'."""
@@ -563,10 +565,14 @@
         self.be.wc.results[QUOTA_API] = SAMPLE_QUOTA_JSON
 
     @inlineCallbacks
-    def test_volumes_info(self):
-        """The volumes_info method exercises its callback."""
-        result = yield self.be.account_info()
-        free_bytes = int(result['quota_total']) - int(result['quota_used'])
+    def expected_volumes(self, sample_shares, sample_folders):
+        """Get shares and group by sharing user, get folders and free space."""
+        try:
+            result = yield self.be.account_info()
+        except Exception:  # pylint: disable=W0703
+            free_bytes = self.be.FREE_BYTES_NOT_AVAILABLE
+        else:
+            free_bytes = int(result['quota_total']) - int(result['quota_used'])
 
         # get root dir info
         root_volume = {u'volume_id': u'', u'path': ROOT_PATH,
@@ -574,7 +580,7 @@
 
         # get shares and group by sharing user
         shares = defaultdict(list)
-        for share in SAMPLE_SHARES:
+        for share in sample_shares:
             # filter out non accepted values
             if not bool(share['accepted']):
                 continue
@@ -593,15 +599,29 @@
             shares[username].append(share)
 
         folders = []
-        for folder in SAMPLE_FOLDERS:
+        for folder in sample_folders:
             folder = folder.copy()
             folder[u'type'] = self.be.FOLDER_TYPE
             folders.append(folder)
 
         expected = [(u'', unicode(free_bytes), [root_volume] + folders)]
         for other_user, data in shares.iteritems():
-            expected.append((other_user, data[0][u'free_bytes'], data))
-
+            send_freebytes = any(d['access_level'] == 'Modify' for d in data)
+            if send_freebytes:
+                free_bytes = data[0][u'free_bytes']
+            else:
+                free_bytes = self.be.FREE_BYTES_NOT_AVAILABLE
+            expected.append((other_user, free_bytes, data))
+
+        returnValue(expected)
+
+    @inlineCallbacks
+    def test_volumes_info(self):
+        """The volumes_info method exercises its callback."""
+        self.patch(MockDBusClient, 'shares', SAMPLE_SHARES)
+        self.patch(MockDBusClient, 'folders', SAMPLE_FOLDERS)
+
+        expected = yield self.expected_volumes(SAMPLE_SHARES, SAMPLE_FOLDERS)
         result = yield self.be.volumes_info()
         self.assertEqual(result, expected)
 
@@ -614,14 +634,23 @@
     @inlineCallbacks
     def test_volumes_are_cached(self):
         """The volume list is cached."""
+        self.patch(MockDBusClient, 'shares', SAMPLE_SHARES)
+        self.patch(MockDBusClient, 'folders', SAMPLE_FOLDERS)
+
         # get root dir info
         root_volume = {u'volume_id': u'', u'path': ROOT_PATH,
                        u'subscribed': 'True', u'type': self.be.ROOT_TYPE}
         expected = {u'': root_volume}
         for volume in SAMPLE_SHARES + SAMPLE_FOLDERS:
+            volume = volume.copy()
             if volume[u'type'] == u'UDF':
                 volume[u'type'] = self.be.FOLDER_TYPE
             else:
+                if not bool(volume[u'accepted']):
+                    continue
+                path = volume[u'path']
+                nicer_path = path.replace(SHARES_PATH, SHARES_PATH_LINK)
+                volume[u'path'] = nicer_path
                 volume[u'type'] = self.be.SHARE_TYPE
 
             sid = volume['volume_id']
@@ -639,6 +668,56 @@
         yield self.test_volumes_are_cached()
 
     @inlineCallbacks
+    def test_volumes_info_no_quota_for_read_onlys(self):
+        """The volumes_info does not send qupota info for RO shares."""
+        read_only_shares = [
+            {u'accepted': u'True',
+             u'subscribed': u'True',
+             u'access_level': u'View',
+             u'free_bytes': u'39892622746',
+             u'generation': u'2704',
+             u'name': u're',
+             u'node_id': u'c483f419-ed28-490a-825d-a8c074e2d795',
+             u'other_username': u'otheruser',
+             u'other_visible_name': u'Other User',
+             u'path': SHARES_PATH + u'/re from Other User',
+             u'type': u'Share',
+             u'volume_id': u'4a1b263b-a2b3-4f66-9e66-4cd18050810d'},
+            {u'accepted': u'True',
+             u'subscribed': u'True',
+             u'access_level': u'View',
+             u'free_bytes': u'39892622746',
+             u'generation': u'2704',
+             u'name': u'do',
+             u'node_id': u'84544ea4-aefe-4f91-9bb9-ed7b0a805baf',
+             u'other_username': u'otheruser',
+             u'other_visible_name': u'Other User',
+             u'path': SHARES_PATH + u'/do from Other User',
+             u'type': u'Share',
+             u'volume_id': u'7d130dfe-98b2-4bd5-8708-9eeba9838ac0'},
+        ]
+
+        self.patch(MockDBusClient, 'shares', read_only_shares)
+        self.patch(MockDBusClient, 'folders', SAMPLE_FOLDERS)
+
+        expected = yield self.expected_volumes(read_only_shares,
+                                               SAMPLE_FOLDERS)
+        result = yield self.be.volumes_info()
+        self.assertEqual(result, expected)
+
+    @inlineCallbacks
+    def test_volumes_info_no_quota_for_root(self):
+        """The volumes_info returns info even if quota call fails."""
+        # pylint: disable=E1101
+        self.be.wc.failure = 500
+        self.patch(MockDBusClient, 'shares', SAMPLE_SHARES)
+        self.patch(MockDBusClient, 'folders', SAMPLE_FOLDERS)
+
+        expected = yield self.expected_volumes(SAMPLE_SHARES, SAMPLE_FOLDERS)
+        result = yield self.be.volumes_info()
+        self.assertEqual(result, expected)
+
+    @inlineCallbacks
     def test_subscribe_volume_folder(self):
         """The subscribe_volume method subscribes a folder."""
         fid = '0123-4567'