Merge lp:~diegosarmentero/ubuntuone-control-panel/tests-failing into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Using suggested_path to server path comparisons (LP: 1004603).

[lp:~diegosarmentero/ubuntuone-control-panel/tests-failing]

330. By Diego Sarmentero on 2012-05-29

removing unnecesary import

331. By Diego Sarmentero on 2012-05-29

Linking bug

332. By Diego Sarmentero on 2012-05-29

adding test with ~/

[Brian Curtin (brian.curtin)]

Looks good to me. Passes on Windows.

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== added file 'data/audio-x-generic.png'
Binary files data/audio-x-generic.png	1970-01-01 00:00:00 +0000 and data/audio-x-generic.png	2012-05-29 17:22:19 +0000 differ
=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2012-05-14 21:05:08 +0000
+++ data/qt/images.qrc	2012-05-29 17:22:19 +0000
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/">
+    <file>../audio-x-generic.png</file>
     <file>../banner.png</file>
     <file>../computer.png</file>
     <file>../external_icon_dark_grey.png</file>

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-05-14 18:50:12 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-05-29 17:22:19 +0000
@@ -80,10 +80,15 @@
 
 def _process_name(name):
     """Tweak 'name' with a translatable music folder name."""
-    if name == MUSIC_REAL_PATH:
+    if name.startswith('~/'):
+        suggested = name[2:]
+    else:
+        suggested = name
+
+    if suggested == MUSIC_REAL_PATH:
         result = MUSIC_DISPLAY_NAME
     else:
-        result = name
+        result = suggested
     return result
 
 
@@ -203,7 +208,8 @@
                     child.volume_path = volume['path']
                 child.volume_id = volume['volume_id']
 
-                name = _process_name(volume[u'display_name'])
+                name = _process_name(volume.get(u'suggested_path',
+                    volume[u'display_name']))
                 child.setText(FOLDER_NAME_COL, name)
                 child.setToolTip(FOLDER_NAME_COL, name)
                 child.setToolTip(EXPLORE_COL, FOLDERS_COLUMN_EXPLORE)
@@ -505,21 +511,25 @@
                 for volume in volumes:
                     if (volume[u'type'] == self.backend.FOLDER_TYPE and
                         bool(volume['subscribed'])):
-                        folders.append((volume['path'], volume['volume_id']))
+                        suggested = volume.get(u'suggested_path',
+                            volume[u'display_name'])
+                        folders.append((volume['path'], volume['volume_id'],
+                                        suggested))
 
             # add local folders only if they are valid
             for folder in default_folders(user_home=self.user_home):
                 is_valid = yield self.backend.validate_path_for_folder(folder)
                 if is_valid:
-                    folders.append((folder, None))
+                    folders.append((folder, None, None))
 
             # always clear the items dict first, since clearing the folders
             # list will trigger "underlying C/C++ object has been deleted"
             self.items.clear()
             self.ui.folders.clear()
 
-            for path, volume_id in folders:
-                self.add_folder(folder_path=path, volume_id=volume_id)
+            for path, volume_id, suggested in folders:
+                self.add_folder(folder_path=path, volume_id=volume_id,
+                    suggested=suggested)
 
             if folders and not self.timer.isActive():
                 self.timer.start(2000)
@@ -552,20 +562,23 @@
         self.changesApplied.emit()
 
     @handle_errors(logger=logger)
-    def add_folder(self, folder_path, volume_id=None):
+    def add_folder(self, folder_path, volume_id=None, suggested=None):
         """Add a folder to the list."""
         if folder_path in self.items:
             logger.warning('LocalFoldersPanel: already have an item for %r.',
                            folder_path)
             return
 
-        if self.user_home is None:
+        if suggested is None:
             logger.warning('LocalFoldersPanel: user home is None! '
                            'paths will not be pretty.')
-            display_name = folder_path
-        else:
-            user_home = self.user_home + os.path.sep
+            if self.user_home is None:
+                user_home = ''
+            else:
+                user_home = self.user_home + os.path.sep
             display_name = _process_name(folder_path.replace(user_home, ''))
+        else:
+            display_name = _process_name(suggested)
 
         item = FolderItem([display_name, ""], path=folder_path,
                           queue=self.queue, volume_id=volume_id)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-05-14 18:50:12 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-05-29 17:22:19 +0000
@@ -37,6 +37,7 @@
     FAKE_VOLUMES_ONLY_ROOT_INFO,
     MUSIC_FOLDER, MUSIC_PATH, ROOT, USER_HOME,
 )
+from ubuntuone.controlpanel.gui import MUSIC_REAL_PATH
 from ubuntuone.controlpanel.gui.qt import folders as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     BaseTestCase,
@@ -1219,13 +1220,13 @@
 class LocalFoldersPanelAddFolderTestCase(BaseLocalFoldersPanelTestCase):
     """Test suite for the add_folder method from LocalFoldersPanel."""
 
-    def test_folder_is_added(self, folder_path=None):
+    def test_folder_is_added(self, folder_path=None, suggested=None):
         """Adding a folder adds it to the folder list."""
         former_count = self.ui.ui.folders.topLevelItemCount()
 
         if folder_path is None:
             folder_path = self.path
-        self.ui.add_folder(folder_path)
+        self.ui.add_folder(folder_path, suggested=suggested)
 
         new_count = self.ui.ui.folders.topLevelItemCount()
         self.assertEqual(new_count, former_count + 1)
@@ -1233,7 +1234,14 @@
 
     def test_add_music_folder_adds_the_folder(self):
         """Adding the purchased music folder adds it to the folder list."""
-        self.test_folder_is_added(folder_path=MUSIC_PATH)
+        self.test_folder_is_added(folder_path=MUSIC_PATH,
+            suggested=MUSIC_REAL_PATH)
+
+    def test_add_music_folder_adds_the_folder_with_suggested_path(self):
+        """Adding the purchased music folder adds it to the folder list."""
+        suggested_path = '~/' + MUSIC_REAL_PATH
+        self.test_folder_is_added(folder_path=MUSIC_PATH,
+            suggested=suggested_path)
 
     def test_do_not_add_twice(self):
         """The same folder will not be added twice."""