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

[dobey]

[Roberto Alsina]

    - Unstyled the spinboxes (Partially fixes LP:966283).
    - Reverse styling for web buttons in RTL locales (Fixes LP:983665).
    - Restore minimized windows from the tray (Fixes LP:865688).
    - Made CalculateSize use bytes when calling os.walk (Fixes LP:959447).

[Diego Sarmentero]

    - Checking that we are receiving the right argument type, or ignore it if it's not valid (LP: #995146).

[Roberto Alsina (ralsina)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

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

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

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: cannot import name BaseMockWebServer

[Ubuntu One Auto Pilot (otto-pilot)]

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

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

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/__init__.py", line 28, in <module>
    from ubuntuone.controlpanel.backend import (
  File "/mnt/tarmac/cache/ubuntuone-control-panel/stable-3-0/ubuntuone/controlpanel/backend.py", line 27, in <module>
    from ubuntuone.platform.credentials import CredentialsManagementTool
ImportError: No module named platform.credentials

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/sru-backports 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.tests.test_replication_client
  ReplicationsTestCase
    test_exclude ... [OK]
    test_exclude_name_in_exclusions ... [OK]
    test_exclude_name_not_in_replications ... [OK]
    test_get_exclusions ... [OK]
    test_get_replications ... [OK]
    test_no_pairing_record ... [OK]
    test_replicate ... [OK]
    test_replicate_name_not_in_exclusions ... [OK]
    test_replicate_name_not_in_replications ... [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ... [OK]
ubuntuone.controlpanel.tests.test_sd_client
  AutoconnectTestCase
    test_disable ... [OK]
    test_disable_throws_an_error ... [OK]
    test_enable ... [OK]
    test_enable_throws_an_error ... [OK]
    test_get_value ... [OK]
    test_get_value_throws_an_error ... [OK]
  BaseTestCase
    runTest ... [OK]
  BasicTestCase
    test_get_current_status ... [OK]
    test_get_current_status_error ... [OK]
    test_get_root_dir ... [OK]
    test_get_shares_dir ... [OK]
    test_get_shares_dir_link ... [OK]
  FileSyncTestCase
    test_connect_file_sync ... [OK]
    test_disable_file_sync ... [OK]
    test_disconnect_file_sync ... [OK]
    test_enable_file_sync ... [OK]
    test_file_sync_enabled ... [OK]
    test_set_status_changed_handler ... [OK]
    test_start_file_sync ... [OK]
    test_stop_file_sync ... [OK]
  FoldersTestCase
    test_create_folder ... [OK]
    test_create_folder_error ... [OK]
    test_get_folders ... [OK]
    test_get_folders_error ... [OK]
    test_sub...

=== added file 'data/external_icon_dark_grey-rtl.png'
 Binary files data/external_icon_dark_grey-rtl.png	1970-01-01 00:00:00 +0000 and data/external_icon_dark_grey-rtl.png	2012-05-18 17:20:24 +0000 differ
=== added file 'data/external_icon_orange-rtl.png'
 Binary files data/external_icon_orange-rtl.png	1970-01-01 00:00:00 +0000 and data/external_icon_orange-rtl.png	2012-05-18 17:20:24 +0000 differ
=== added file 'data/external_icon_white-rtl.png'
 Binary files data/external_icon_white-rtl.png	1970-01-01 00:00:00 +0000 and data/external_icon_white-rtl.png	2012-05-18 17:20:24 +0000 differ
=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2012-03-22 16:44:35 +0000
+++ data/qt/images.qrc	2012-05-18 17:20:24 +0000
@@ -5,6 +5,9 @@
     <file>../external_icon_dark_grey.png</file>
     <file>../external_icon_orange.png</file>
     <file>../external_icon_white.png</file>
+    <file>../external_icon_dark_grey-rtl.png</file>
+    <file>../external_icon_orange-rtl.png</file>
+    <file>../external_icon_white-rtl.png</file>
     <file>../icon.png</file>
     <file>../folder.png</file>
     <file>../logo.png</file>
@@ -24,6 +27,7 @@
     <file>../Ubuntu-R.ttf</file>
     <file>../Ubuntu-B.ttf</file>
     <file>ubuntuone.qss</file>
+    <file>ubuntuone-rtl.qss</file>
     <file>linux.qss</file>
     <file>windows.qss</file>
   </qresource>
 
=== added file 'data/qt/ubuntuone-rtl.qss'
--- data/qt/ubuntuone-rtl.qss	1970-01-01 00:00:00 +0000
+++ data/qt/ubuntuone-rtl.qss	2012-05-18 17:20:24 +0000
@@ -0,0 +1,27 @@
+GoToWebButton#help_button {
+    background-image: url(:/external_icon_dark_grey-rtl.png);
+    background-position: left;
+}
+
+GoToWebButton#share_publish_button {
+    background-image: url(:/external_icon_orange-rtl.png);
+    background-position: left;
+}
+
+GoToWebButton#edit_profile_button,
+GoToWebButton#edit_services_button,
+GoToWebButton#get_more_space_button {
+    background-image: url(:/external_icon_white-rtl.png);
+    background-position: left;
+}
+
+QTabWidget::pane {
+    border-top-left-radius: 5px;
+    border-top-right-radius: 0px;
+}
+
+QFrame#frame_status,
+QFrame#frame_storage {
+    border-right-width: 1px;
+    border-left-width: 0px;
+}
 
=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-03-27 14:32:09 +0000
+++ data/qt/ubuntuone.qss	2012-05-18 17:20:24 +0000
@@ -338,13 +338,6 @@
     background-color: white;
 }
 
-QSpinBox:focus {
-    border: 2px solid #dd4814;
-    border-radius: 5px;
-    padding: 0px;
-}
-
-
 QTreeWidget::item:selected {
     background: #fcece7;
     color: black;
 
=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-03-29 21:41:54 +0000
+++ ubuntuone/controlpanel/backend.py	2012-05-18 17:20:24 +0000
@@ -16,6 +16,7 @@
 
 """A backend for the Ubuntu One Control Panel."""
 
+import collections
 import operator
 import os
 
@@ -152,9 +153,13 @@
             FILE_SYNC_UNKNOWN
         * MSG_KEY: a non translatable but human readable string of the status.
 
+        Return None if we receive and invalid type in status.
+
         """
         logger.debug('sync status: %r', status)
-        if not status:
+        if not isinstance(status, collections.Mapping):
+            return None
+        elif not status:
             self.file_sync_disabled = True
             return self.STATUS_DISABLED
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2012-03-02 13:53:24 +0000
+++ ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2012-05-18 17:20:24 +0000
@@ -139,6 +139,8 @@
     @log_call(logger.debug)
     def process_info(self, status):
         """Match status with signals."""
+        if status is None:
+            return
         try:
             status_key = status[backend.STATUS_KEY]
             data = FILE_SYNC_STATUS[status_key]
 
=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-04-02 17:41:54 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-05-18 17:20:24 +0000
@@ -20,6 +20,7 @@
 
 import os
 import Queue
+import sys
 import threading
 
 from PyQt4 import QtGui, QtCore
@@ -347,9 +348,17 @@
     """A thread that calculates, in the background, the size of a folder."""
 
     def __init__(self, path_name, queue):
-        self.path_name = path_name
         self.queue = queue
         self._stop = False
+        # This makes os.walk use the "bytes" version, which doesn't
+        # break with invalid unicode paths.
+        # This will only work for unicode locales (ex: LANG=es_ES.UTF-8)
+        # and will falback to as before for C and non-unicode locales.
+        try:
+            self.path_name = path_name.encode(sys.getfilesystemencoding())
+        except (UnicodeEncodeError, UnicodeDecodeError):
+            # Should never happen (haha)
+            self.path_name = path_name
 
         super(CalculateSize, self).__init__()
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-04-25 14:31:36 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-05-18 17:20:24 +0000
@@ -89,7 +89,10 @@
     source.main(app)
 
     data = []
-    for qss_name in (":/ubuntuone.qss", source.PLATFORM_QSS):
+    qss_files = [":/ubuntuone.qss", source.PLATFORM_QSS]
+    if app.isRightToLeft():
+        qss_files.append(":/ubuntuone-rtl.qss")
+    for qss_name in qss_files:
         qss = QtCore.QResource(qss_name)
         data.append(unicode(qss.data()))
     app.setStyleSheet('\n'.join(data))
 
=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-04-25 14:31:36 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-05-18 17:20:24 +0000
@@ -62,6 +62,10 @@
     def installTranslator(self, translator):
         """Fake installTranslator."""
         self.translator = translator
+
+    def isRightToLeft(self):
+        """Fake isRightToLeft."""
+        return False
     # pylint: enable=C0103
 
     def arguments(self):
 
=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2012-03-02 13:53:24 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2012-05-18 17:20:24 +0000
@@ -60,6 +60,7 @@
             # pylint: enable=W0404
             self.window = MainWindow(close_callback=self.delete_window)
         self.window.show()
+        self.window.activateWindow()
 
     def delete_window(self):
         """Close and remove the main window."""
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2012-03-12 16:36:06 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2012-05-18 17:20:24 +0000
@@ -93,6 +93,21 @@
         self.assertIsInstance(self.ui.backend,
                               backend.ControlBackend)
 
+    def test_process_info_invalid_status(self):
+        """File sync status invalid, ignore event."""
+        status = {backend.STATUS_KEY: backend.FILE_SYNC_STARTING,
+                  backend.MSG_KEY: gui.FILE_SYNC_STARTING,
+                  'icon': backend.FILE_SYNC_STARTING}
+        self.ui.process_info(status)
+        self.ui.process_info(3)
+
+        actual_icon = self.ui.ui.sync_status_icon.pixmap()
+        pixmap_name = gui.icon_name_from_status(backend.FILE_SYNC_STARTING)
+        expected_icon = gui.pixmap_from_name(pixmap_name)
+        self.assertEqualPixmaps(expected_icon, actual_icon)
+        actual_text = unicode(self.ui.ui.sync_status_label.text())
+        self.assertEqual(gui.FILE_SYNC_STARTING, actual_text)
+
     def test_process_info_changed(self):
         """Backend's file sync status changed callback is connected."""
         self.assertEqual(self.ui.backend.status_changed_handler,
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-29 17:35:30 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-05-18 17:20:24 +0000
@@ -22,6 +22,7 @@
 import os
 import Queue
 import shutil
+import sys
 
 from PyQt4 import QtGui
 from twisted.internet import defer
@@ -675,7 +676,7 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        self.path = 'not-existing-dir'
+        self.path = u'not-existing-dir'
         self.expected_size = self.build_test_dir(self.path)
         self.queue = Queue.Queue()
         yield super(BaseLocalFoldersTestCase, self).setUp()
@@ -685,7 +686,8 @@
         assert not os.path.exists(dir_path)
 
         os.makedirs(dir_path)
-        self.addCleanup(shutil.rmtree, dir_path)
+        self.addCleanup(shutil.rmtree,
+            dir_path.encode(sys.getfilesystemencoding()))
 
         total_size = 0
 
@@ -775,6 +777,31 @@
         self.started = True
 
 
+class CalculateSizeWithInvalidPath(CalculateSizeTestCase):
+    """Test suite for the CalculateSize thread implementation."""
+
+    def build_test_dir(self, dir_path):
+        """Build a testing directory hierarchy."""
+        total_size = super(CalculateSizeWithInvalidPath,
+                           self).build_test_dir(dir_path)
+        # Have to crete as bytes because it's an invalid path
+        a_file = os.path.join(dir_path.encode(sys.getfilesystemencoding()),
+            '\xe7\xa7')
+        with open(a_file, 'wb') as f:
+            f.write('y' * 5000)
+        total_size += os.path.getsize(a_file)
+        return total_size
+
+    def test_run(self):
+        """The run() method calculates the size for the given path."""
+        self.ui.run()
+
+        path, size = self.queue.get(block=True, timeout=0.5)
+
+        self.assertEqual(path, self.path)
+        self.assertEqual(size, self.expected_size)
+
+
 class FolderItemTestCase(BaseLocalFoldersTestCase):
     """Test suite for the FolderItem widget."""
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-02-06 21:10:10 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-05-18 17:20:24 +0000
@@ -100,6 +100,18 @@
         self.assertEqual(tray.window, window)
         self.assertTrue(tray.window.isVisible())
 
+    def test_restore_window_minimized(self):
+        """Test the restore window option in the menu, with a min. window."""
+        tray = systray.TrayIcon()
+        window = FakeMainWindow()
+        # This cannot be tested with the real activateWindow
+        # because the un-minimization is done by the WM, so
+        # it has a small delay, and it fails.
+        self.patch(window, "activateWindow", self._set_called)
+        tray.window = window
+        tray.restore.trigger()
+        self.assertEqual(self._called, ((), {}))
+
     def test_delete_window(self):
         """Test deleting an existing window."""
         tray = systray.TrayIcon()
 
=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2012-03-29 21:37:22 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2012-05-18 17:20:24 +0000
@@ -1370,6 +1370,14 @@
         expected_status = self.be._process_file_sync_status(status)
         self.assertEqual(self._called, ((expected_status,), {}))
 
+    def test_invalid_status_type(self):
+        """Check that the method return None with invalid types."""
+        self.be.status_changed_handler = self._set_called
+        status = 3
+        self.be.sd_client.status_changed_handler(status)
+
+        self.assertEqual(self._called, ((None,), {}))
+
 
 class BackendSyncStatusIfDisabledTestCase(BackendSyncStatusTestCase):
     """Syncdaemon state for the backend when file sync is disabled."""