Merge lp:~dobey/ubuntuone-control-panel/update-3-0 into lp:ubuntuone-control-panel/stable-3-0

[dobey]

- Enable folder list sorting (Fixes LP:1006385).

[Roberto Alsina (ralsina)]

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-3-0 into lp:ubuntuone-control-panel/stable-3-0 failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***

ERROR:root:Could not find any typelib for Unity
Traceback (most recent call last):
  File "/usr/bin/u1trial", line 337, in <module>
    main()
  File "/usr/bin/u1trial", line 317, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 196, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 180, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 120, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/ubuntuone-control-panel/stable-3-0/ubuntuone/controlpanel/tests/test_web_client.py", line 24, in <module>
    from ubuntu_sso.utils.webclient.tests import BaseMockWebServer
ImportError: No module named tests

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-3-0 into lp:ubuntuone-control-panel/stable-3-0 failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***
ubuntuone.controlpanel.utils.tests.test_utils
  ExceptionHandlingTestCase
    test_exception_to_error_dict ... [OK]
    test_failure_to_error_dict ... [OK]
  GetDataFileTestCase
    test_get_data_file ... [OK]
  GetProjectDirTestCase
    test_get_project_dir_none_exists ... [OK]
    test_get_project_dir_relative ... [OK]
  GetProjectDirWithConstantsTestCase
    test_get_project_dir ... [OK]
    test_get_project_dir_none_exists ... [OK]
    test_get_project_dir_relative ... [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ... [OK]
ubuntuone.controlpanel.utils.tests.test_linux
  AutoupdaterTestCase
    test_are_updates_present ... [OK]
    test_perform_update ... [OK]
  DefaultFoldersTestCase
    test_default_folders_bad_encoding ... [OK]
    test_default_folders_empty_file ... [OK]
    test_default_folders_non_ascii ... [OK]
    test_default_folders_not_file ... [OK]
    test_default_folders_only_comments ... [OK]
    test_default_folders_parsed ... [OK]
    test_default_folders_syntax_error ... [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ... [OK]
    runTest ... [OK]
ubuntuone.controlpanel.tests.test_web_client
  WebClientBuildSignedIriTestCase
    test_correct_app_name ... [OK]
    test_correct_query ... [OK]
    test_get_url ... [OK]
    test_get_url_error ... [OK]
    test_is_correct_domain ... [OK]
    test_is_correct_path ... [OK]
    test_is_correct_scheme ... [OK]
    test_unauthorized ... [OK]
    test_url_with_query ... [OK]
    test_uses_timestamper ... [OK]
  WebClientTestCase
    test_correct_app_name ... [OK]
    test_get_url ... [...

[lp:~dobey/ubuntuone-control-panel/update-3-0]

266. By dobey on 2012-06-14

Fix lint issue

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-05-18 16:52:11 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-06-14 18:54:18 +0000
@@ -132,6 +132,9 @@
         headers.setResizeMode(SUBSCRIPTION_COL, headers.ResizeToContents)
         headers.setResizeMode(EXPLORE_COL, headers.ResizeToContents)
 
+        self.ui.folders.setSortingEnabled(True)
+        self.ui.folders.sortByColumn(FOLDER_NAME_COL, QtCore.Qt.AscendingOrder)
+
         self.ui.share_publish_button.setText(FOLDERS_MANAGE_LABEL)
         self.ui.share_publish_button.uri = MANAGE_FILES_LINK
         QtGui.QApplication.instance().focusChanged.connect(self.focus_changed)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-05-18 16:52:11 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-06-14 18:54:18 +0000
@@ -18,13 +18,12 @@
 
 import copy
 import logging
-import operator
 import os
 import Queue
 import shutil
 import sys
 
-from PyQt4 import QtGui
+from PyQt4 import QtCore, QtGui
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
@@ -193,28 +192,21 @@
 
     def test_process_info(self):
         """The volumes info is processed when ready."""
+        folders = self.ui.ui.folders
         self.ui.process_info(FAKE_VOLUMES_INFO)
-        folders = self.ui.ui.folders
-
         root = folders.invisibleRootItem()
         self.assertEqual(len(FAKE_VOLUMES_INFO), root.childCount())
 
-        treeiter = gui.QtGui.QTreeWidgetItemIterator(folders)
         for name, _, volumes in FAKE_VOLUMES_INFO:
             name = _build_name(name)
-
-            # get first child, matching "My Folders"
-            item = treeiter.value()
-            self.assertFalse(item.is_empty)
-
+            items = folders.findItems(name, QtCore.Qt.MatchFixedString
+                | QtCore.Qt.MatchCaseSensitive | QtCore.Qt.MatchRecursive,
+                gui.FOLDER_NAME_COL)
+            self.assertEqual(1, len(items))
+            item = items[0]
             self.assert_folder_group_header_correct(item, name)
-
             self.assertEqual(len(volumes), item.childCount())
-            sorted_vols = sorted(volumes, key=operator.itemgetter('path'))
-            for volume in sorted_vols:
-                treeiter += 1
-                item = treeiter.value()  # get child folder
-                self.assertTrue(item is not None)
+            for volume in volumes:
 
                 name = volume['path'].replace(USER_HOME + os.path.sep, '')
                 expected_path = volume['path']
@@ -227,12 +219,14 @@
                 else:
                     icon_name = gui.SHARE_ICON_NAME
 
+                items = folders.findItems(name, QtCore.Qt.MatchFixedString |
+                    QtCore.Qt.MatchCaseSensitive | QtCore.Qt.MatchRecursive,
+                    gui.FOLDER_NAME_COL)
+                self.assertEqual(1, len(items))
+                item = items[0]
                 self.assert_folder_row_correct(item, name, icon_name, volume,
                                                tweaked_path=expected_path)
 
-            treeiter += 1
-            item = treeiter.value()
-
     def test_process_info_clears_the_list(self):
         """The old volumes info is cleared before updated."""
         self.ui.process_info(FAKE_VOLUMES_INFO)
@@ -254,9 +248,10 @@
 
         child_index = 0
         root = self.ui.ui.folders.invisibleRootItem()
-        for name, _, _ in FAKE_VOLUMES_NO_FREE_SPACE_INFO:
-            name = _build_name(name)
-
+        names = [_build_name(name) for name, _, _ in
+            FAKE_VOLUMES_NO_FREE_SPACE_INFO]
+        names.sort(key=lambda x: x.lower())
+        for name in names:
             item = root.child(child_index)
             self.assertFalse(item.is_empty)
             self.assert_folder_group_header_correct(item, name)
@@ -363,35 +358,23 @@
         """Ensure that the inner widgets are in the correct tab order."""
         self.ui.process_info(FAKE_VOLUMES_INFO)
         folders = self.ui.ui.folders
-
         widget = self.ui.ui.folders.nextInFocusChain()
         treeiter = gui.QtGui.QTreeWidgetItemIterator(folders)
-        for name, _, volumes in FAKE_VOLUMES_INFO:
-            item = treeiter.value()
-            sorted_vols = sorted(volumes, key=operator.itemgetter('path'))
-            for volume in sorted_vols:
+        while treeiter.value():
+            if treeiter.value().parent() is None:  # Top-levels
                 treeiter += 1
-                item = treeiter.value()  # get child folder
-
-                name = volume['path'].replace(USER_HOME + os.path.sep, '')
-                if volume['type'] == self.ui.backend.SHARE_TYPE:
-                    name = volume['name']
-                self.assertEqual(unicode(item.text(gui.FOLDER_NAME_COL)), name)
-
-                if volume['type'] != self.ui.backend.ROOT_TYPE:
-                    self.assertIsInstance(widget, QtGui.QCheckBox)
-                    self.assertEqual(unicode(
-                        self.ui.widget_items[widget].text(0)), name)
-                    widget = widget.nextInFocusChain()
-
-                if not self.ui.remote_folders:
-                    self.assertIsInstance(widget, QtGui.QPushButton)
-                    self.assertEqual(unicode(
-                        self.ui.widget_items[widget].text(0)), name)
-                    widget = widget.nextInFocusChain()
-
+                continue
+            if self.ui.remote_folders:
+                self.assertIsInstance(widget, QtGui.QCheckBox)
+            # ROOT volume has no checkbox
+            elif treeiter.value().text(1) or self.ui.remote_folders:
+                self.assertIsInstance(widget, QtGui.QPushButton)
+            else:
+                self.assertIsInstance(widget, QtGui.QCheckBox)
+                widget = widget.nextInFocusChain()
+                self.assertIsInstance(widget, QtGui.QPushButton)
+            widget = widget.nextInFocusChain()
             treeiter += 1
-            item = treeiter.value()
 
     def test_widget_dict(self):
         """Ensure the widget_items dictionary is full."""