Merge lp:~ralsina/ubuntuone-control-panel/unique-3-0 into lp:ubuntuone-control-panel/stable-3-0

[Roberto Alsina]

 - Implemented UniqueApplication for Linux (Fixes LP:987909).

 - Implemented UniqueApplication for Linux (Fixes LP:987909).

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~ralsina/ubuntuone-control-panel/unique-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 ***

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:~ralsina/ubuntuone-control-panel/unique-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 ***

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 26, 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:~ralsina/ubuntuone-control-panel/unique-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.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_subs...

=== modified file 'run-tests'
--- run-tests	2012-02-29 19:49:44 +0000
+++ run-tests	2012-04-25 14:34:51 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-QT_TESTS_PATH="ubuntuone/controlpanel/gui/qt/tests, ubuntuone/controlpanel/gui/qt/main/tests"
+QT_TESTS_PATH="ubuntuone/controlpanel/gui/qt/tests, ubuntuone/controlpanel/gui/qt/main/tests, ubuntuone/controlpanel/gui/qt/uniqueapp/tests"
 DBUS_TESTS_PATH=ubuntuone/controlpanel/dbustests
 WINDOWS_TESTS=test_windows.py
 

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-29 17:20:14 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-04-25 14:34:51 +0000
@@ -100,6 +100,7 @@
                          installer=installer)
     if window:
         window.switch_to(switch_to)
+        app.new_instance.connect(window.raise_)
     # pylint: enable=W0612
     if icon:
         app.new_instance.connect(icon.restore_window)

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-29 17:08:33 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-04-25 14:34:51 +0000
@@ -23,6 +23,7 @@
 
 from ubuntuone.controlpanel.gui.qt import main
 from ubuntuone.controlpanel.tests import TestCase
+from ubuntuone.controlpanel.gui.tests import FakeSignal
 
 
 class FakeTranslator(object):
@@ -44,6 +45,7 @@
         self.args = None
         self.style = None
         self.translator = None
+        self.new_instance = FakeSignal()
 
     def __call__(self, argv, *args, **kwargs):
         """Fake arg filtering function."""
@@ -77,6 +79,7 @@
 
     tabname = None
     urgent = None
+    raised = None
 
     def switch_to(self, tabname):
         """Fake switch_to."""
@@ -86,6 +89,10 @@
         """Fake set_urgent."""
         self.urgent = value
 
+    def raise_(self):
+        """Fake raise."""
+        self.raised = True
+
 
 class FakeStart(object):
 
@@ -183,3 +190,9 @@
         self.assertEqual(self.translator.args, (("qt_" + locale,
             QtCore.QLibraryInfo.location(
                 QtCore.QLibraryInfo.TranslationsPath)), {}))
+
+    def test_new_instance(self):
+        """Ensure the new_instance signal is connected."""
+        main.main([sys.argv[0]])
+        self.assertEqual(self.app.new_instance.target,
+            self.start.window.raise_)

=== modified file 'ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	2012-01-23 20:15:09 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	2012-04-25 14:34:51 +0000
@@ -16,13 +16,33 @@
 
 """A QApplication that starts a single instance."""
 
-#pylint: disable=W0404
 import sys
 
-if sys.platform == "win32":
-    from ubuntuone.controlpanel.gui.qt.uniqueapp import windows as platform
-else:
-    from ubuntuone.controlpanel.gui.qt.uniqueapp import linux as platform
-
-#pylint: disable=C0103
-UniqueApplication = platform.UniqueApplication
+from PyQt4 import QtNetwork, QtGui, QtCore
+
+
+class UniqueApplication(QtGui.QApplication):
+
+    """A dummy UniqueApplication class."""
+
+    new_instance = QtCore.pyqtSignal()
+
+    def __init__(self, argv, key):
+        super(UniqueApplication, self).__init__(argv)
+        self.key = key
+        self.server = QtNetwork.QLocalServer(self)
+        self.server.newConnection.connect(self.new_instance.emit)
+        self.aboutToQuit.connect(self.cleanup)
+        # Try to connect to existing app
+        socket = QtNetwork.QLocalSocket()
+        socket.connectToServer(key, QtCore.QIODevice.WriteOnly)
+        if socket.waitForConnected(500):
+            # Connected, exit
+            sys.exit()
+
+        # Not connected, start server
+        self.ready = self.server.listen(key)
+
+    def cleanup(self):
+        """Remove the socket when we die."""
+        self.server.removeServer(self.key)

=== removed file 'ubuntuone/controlpanel/gui/qt/uniqueapp/linux.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/linux.py	2012-02-24 02:49:47 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/linux.py	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2011 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""A QApplication that starts a single instance."""
-
-from PyQt4 import QtGui, QtCore
-
-
-class UniqueApplication(QtGui.QApplication):
-
-    """A dummy UniqueApplication class."""
-
-    new_instance = QtCore.pyqtSignal()
-
-    def __init__(self, argv, key):
-        super(UniqueApplication, self).__init__(argv)

=== renamed file 'ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_windows.py' => 'ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_unique_app.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_windows.py	2012-01-02 14:29:16 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_unique_app.py	2012-04-25 14:34:51 +0000
@@ -19,8 +19,9 @@
 from PyQt4 import QtCore
 from twisted.internet.defer import inlineCallbacks
 
-from ubuntuone.controlpanel.gui.qt.uniqueapp import windows as uniqueapp
+from ubuntuone.controlpanel.gui.qt import uniqueapp
 from ubuntuone.controlpanel.tests import TestCase
+from ubuntuone.controlpanel.gui.tests import FakeSignal
 
 
 #pylint: disable=C0103
@@ -42,28 +43,6 @@
         return self.connect_succeeds
 
 
-class FakeSignal(object):
-
-    """A fake PyQt signal."""
-
-    def __init__(self, *args, **kwargs):
-        """Initialize."""
-        self.target = None
-
-    def connect(self, target):
-        """Fake connect."""
-        self.target = target
-
-    def disconnect(self, *args):
-        """Fake disconnect."""
-        self.target = None
-
-    def emit(self, *args):
-        """Fake emit."""
-        if self.target:
-            self.target(*args)
-
-
 class FakeLocalServer(object):
 
     """A fake QLocalServer."""

=== removed file 'ubuntuone/controlpanel/gui/qt/uniqueapp/windows.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/windows.py	2012-01-04 11:09:35 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/windows.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2011 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""A QApplication that starts a single instance."""
-
-import sys
-
-from PyQt4 import QtNetwork, QtGui, QtCore
-
-
-class UniqueApplication(QtGui.QApplication):
-
-    """A QApplication that can only be started once.
-
-    Also, the new instance notifies the old one to show
-    its window.
-    """
-
-    new_instance = QtCore.pyqtSignal()
-
-    def __init__(self, argv, key):
-        super(UniqueApplication, self).__init__(argv)
-        self.key = key
-        self.server = QtNetwork.QLocalServer(self)
-        self.server.newConnection.connect(self.new_instance.emit)
-        self.aboutToQuit.connect(self.cleanup)
-        # Try to connect to existing app
-        socket = QtNetwork.QLocalSocket()
-        socket.connectToServer(key, QtCore.QIODevice.WriteOnly)
-        if socket.waitForConnected(500):
-            # Connected, exit
-            sys.exit()
-
-        # Not connected, start server
-        self.ready = self.server.listen(key)
-
-    def cleanup(self):
-        """Remove the socket when we die."""
-        self.server.removeServer(self.key)

=== modified file 'ubuntuone/controlpanel/gui/tests/__init__.py'
--- ubuntuone/controlpanel/gui/tests/__init__.py	2012-03-08 20:46:13 +0000
+++ ubuntuone/controlpanel/gui/tests/__init__.py	2012-04-25 14:34:51 +0000
@@ -175,3 +175,25 @@
             return result
 
         return faked_call_in_faked_object
+
+
+class FakeSignal(object):
+
+    """A fake PyQt signal."""
+
+    def __init__(self, *args, **kwargs):
+        """Initialize."""
+        self.target = None
+
+    def connect(self, target):
+        """Fake connect."""
+        self.target = target
+
+    def disconnect(self, *args):
+        """Fake disconnect."""
+        self.target = None
+
+    def emit(self, *args):
+        """Fake emit."""
+        if self.target:
+            self.target(*args)