Merge lp:~mandel/ubuntuone-client/domain-sockets into lp:ubuntuone-client

[Manuel de la Peña]

- Fixed tests on windows by using the new sso api found in trunk and nightlies (LP: #1001296).
- Added support for domain sockets by using endpoints to listen to a socket and description factories (LP:
#1002208).

- Fixed tests on windows by using the new sso api found in trunk and nightlies (LP: #1001296).
- Added support for domain sockets by using endpoints to listen to a socket and description factories (LP:
#1002208).

Please it is important that you run the tests for this branch using at least revno 73 of ubuntuone-dev-tools.

[Eric Casteleijn (thisfred)]

diff line 224: s/facotry/factory/

Also the DescriptionFactory does not really look like a factory to me, but perhaps I am missing some of the magic parts.

review: Approve

[Diego Sarmentero (diegosarmentero)]

As i mention early today, a lot of tests are failing in my windows evil vm.
I'm marking this as need fixing so we can talk tomorrow, if i'm doing something wrong or what is going on.

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mandel/ubuntuone-client/domain-sockets into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.68
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.3
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking how to print strings... printf
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking how to c...

=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2012-05-14 14:46:32 +0000
+++ contrib/testing/testcase.py	2012-05-22 16:21:33 +0000
@@ -122,8 +122,12 @@
 class FakeExternalInterface(object):
     """A fake DBusInterface..."""
 
+    def start(self):
+        """... that knows how to start."""
+        return defer.succeed(None)
+
     def shutdown(self, with_restart=False):
-        """...that only knows how to go away"""
+        """... how to go away"""
 
     def _request_token(self, *args, **kwargs):
         """Return a token which is a fixed set of credentials."""

=== modified file 'tests/platform/__init__.py'
--- tests/platform/__init__.py	2012-05-15 18:44:46 +0000
+++ tests/platform/__init__.py	2012-05-22 16:21:33 +0000
@@ -30,12 +30,9 @@
 if sys.platform.startswith('linux'):
     from tests.platform.ipc import test_linux
     ipc_source = test_linux
-elif sys.platform == 'darwin':
-    from tests.platform.ipc import test_darwin
-    ipc_source = test_darwin
 else:
-    from tests.platform.ipc import test_windows
-    ipc_source = test_windows
+    from tests.platform.ipc import test_perspective_broker
+    ipc_source = test_perspective_broker
 
 IPCTestCase = ipc_source.IPCTestCase
 StatusTestCase = ipc_source.StatusTestCase

=== removed file 'tests/platform/ipc/test_darwin.py'
--- tests/platform/ipc/test_darwin.py	2012-05-17 11:59:26 +0000
+++ tests/platform/ipc/test_darwin.py	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2012 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/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Tests for the IPC interface."""
-
-
-class IPCTestCase(object):
-    """Empty Implementation"""
-
-
-class StatusTestCase(object):
-    """Empty Implementation"""
-
-
-class EventsTestCase(object):
-    """Empty Implementation"""
-
-
-class SyncDaemonTestCase(object):
-    """Empty Implementation"""
-
-
-class FileSystemTestCase(object):
-    """Empty Implementation"""
-
-
-class SharesTestCase(object):
-    """Empty Implementation"""
-
-
-class ConfigTestCase(object):
-    """Empty Implementation"""
-
-
-class FoldersTestCase(object):
-    """Empty Implementation"""
-
-
-class PublicFilesTestCase(object):
-    """Empty Implementation"""

=== renamed file 'tests/platform/ipc/test_windows.py' => 'tests/platform/ipc/test_perspective_broker.py'
--- tests/platform/ipc/test_windows.py	2012-04-30 14:24:55 +0000
+++ tests/platform/ipc/test_perspective_broker.py	2012-05-22 16:21:33 +0000
@@ -26,17 +26,16 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""IPC tests on windows."""
-
-from collections import namedtuple
+"""IPC tests on perspective broker."""
+import os
 
 from mocker import MockerTestCase, ANY
 
+from dirspec import basedir
 from twisted.internet import defer
 from twisted.spread.pb import (
     DeadReferenceError,
     NoSuchMethod,
-    PBClientFactory,
     RemoteReference,
 )
 from twisted.trial.unittest import TestCase
@@ -45,8 +44,13 @@
     FakedService,
     FakeMainTestCase,
 )
-from ubuntuone.platform.ipc import windows as ipc
-from ubuntuone.platform.ipc.windows import (
+from ubuntuone.devtools.testcases import skipIfOS
+from ubuntuone.devtools.testcases.txsocketserver import (
+    TidyUnixServer,
+    TCPPbServerTestCase,
+)
+from ubuntuone.platform.ipc import perspective_broker as ipc
+from ubuntuone.platform.ipc.perspective_broker import (
     Config,
     Events,
     Folders,
@@ -57,7 +61,6 @@
     SignalBroadcaster,
     Status,
     SyncDaemon,
-    ipc_client_connect,
 )
 from ubuntuone.platform.ipc.ipc_client import (
     signal,
@@ -71,9 +74,11 @@
     SyncDaemonClient,
     SharesClient,
 )
+from ubuntuone.syncdaemon import interaction_interfaces
 
 
 TEST_PORT = 40404
+TEST_DOMAIN_SOCKET = os.path.join(basedir.xdg_cache_home, 'ubuntuone', 'ipc')
 
 
 class RandomException(Exception):
@@ -87,23 +92,9 @@
         """Initialize this fake instance."""
         self.config = config
 
-    def get_active_port(self):
+    def get_active_client_description(self):
         """Return the port where the pb server is running."""
-        return defer.succeed(self.config.port)
-
-
-class FakeReactor(object):
-    """A fake reactor."""
-
-    def __init__(self):
-        """Initialize this faker."""
-        self.connection_class = namedtuple("Connection", "host port factory")
-        self.connections = []
-
-    def connectTCP(self, host, port, factory):
-        """Store the connected factory."""
-        connection = self.connection_class(host, port, factory)
-        self.connections.append(connection)
+        return defer.succeed(self.config.description.client)
 
 
 class FakeDecoratedObject(object):
@@ -373,7 +364,7 @@
         self.assertEqual(fake_remote_object.called, expected)
 
 
-class IPCTestCase(FakeMainTestCase):
+class IPCTestCase(FakeMainTestCase, TCPPbServerTestCase):
     """Set the ipc to a random port for this instance."""
 
     timeout = 5
@@ -385,22 +376,45 @@
     @defer.inlineCallbacks
     def setUp(self):
         """Initialize this test instance."""
-        self.patch(ipc, "get_sd_pb_port", lambda: TEST_PORT)
-        self.patch(ipc, "ActivationClient", FakeActivationClient)
+        self.patch(ipc, 'ActivationClient', FakeActivationClient)
+        # patch the interaction interfaces to not choose the system one but
+        # always the perspective broker one
+        self.patch(interaction_interfaces, 'ExternalInterface', ipc.IPCInterface)
 
         yield super(IPCTestCase, self).setUp()
 
+        class FakeDescriptionFactory(object):
+            """Factory used that returns settings for the test."""
+
+            def __init__(my_self):
+                """Create a new instance."""
+                my_self.server = self.server_runner.get_server_endpoint()
+                my_self.client = self.server_runner.get_client_endpoint()
+
+        # patch the description facotry to return the settings used by the
+        # test
+        self.patch(ipc, 'DescriptionFactory', FakeDescriptionFactory)
+
         self.bus = None  # parity with linux code
 
         self.service = self.service_class(main=self.main, send_events=True)
         self.service.oauth_credentials = ('foo', 'bar')
-        yield self.service.connect()
-
-        self.addCleanup(self.service.shutdown)
+
+        # patch the way the ipc interface is started so that we use the clean
+        # method provided by the test case
+
+        @defer.inlineCallbacks
+        def server_listen(*args):
+            """Start listening using the interface."""
+            yield self.listen_server(self.service.interface)
+            self.service.interface.listener = self.listener
+            defer.returnValue(self.listener)
+
+        self.patch(ipc, 'ipc_server_listen', server_listen)
+        self.connector = yield self.service.start()
+        self.service.connect()
+
         self.interface = self.service.interface
-        self.client_factory = PBClientFactory()
-        self.connector = yield ipc_client_connect(self.client_factory)
-        self.addCleanup(self.connector.disconnect)
 
         if self.client_name is not None:
             client = getattr(self.interface, self.client_name)
@@ -410,6 +424,7 @@
     def get_client(self):
         """Get the client."""
         # request the remote object and create a client
+        yield self.connect_client()
         root = yield self.client_factory.getRootObject()
         if self.client_name is not None:
             remote = yield root.callRemote('get_%s' % self.client_name)
@@ -422,7 +437,6 @@
             result = client
         else:
             result = root
-
         defer.returnValue(result)
 
     @defer.inlineCallbacks
@@ -480,74 +494,131 @@
         expected signature.
 
         """
+
         for signal_name, args in self.signal_mapping:
             self.assert_remote_signal(signal_name, *args)
 
 
-class IPCFunctionsTestCase(IPCTestCase):
-    """Test the functions in the ubuntuone.platform.windows.ipc module."""
-
-    @defer.inlineCallbacks
-    def test_connect(self):
-        """Test the ipc_client_connect function."""
-        fake_reactor = FakeReactor()
-        self.patch(ipc, "reactor", fake_reactor)
-        fake_factory = object()
-        yield ipc_client_connect(fake_factory)
-        self.assertEqual(len(fake_reactor.connections), 1)
-        c = fake_reactor.connections[0]
-        self.assertEqual(c.port, TEST_PORT)
-        self.assertEqual(c.factory, fake_factory)
-
-
 class StatusTestCase(IPCTestCase):
     """Test the status client class."""
 
     client_class = StatusClient
 
 
+@skipIfOS('win32', 'Unix domain sockets not supported on windows.')
+class DUSStatusTestCase(StatusTestCase):
+    """Test the status client class."""
+
+    def get_server(self):
+        """Return the server to be used to run the tests."""
+        return TidyUnixServer()
+
+
 class EventsTestCase(IPCTestCase):
     """Test the events client class."""
 
     client_class = EventsClient
 
 
+@skipIfOS('win32', 'Unix domain sockets not supported on windows.')
+class DUSEventsTestCase(EventsTestCase):
+    """Test the events client class."""
+
+    def get_server(self):
+        """Return the server to be used to run the tests."""
+        return TidyUnixServer()
+
+
 class SyncDaemonTestCase(IPCTestCase):
     """Test the syncdaemon client class."""
 
     client_class = SyncDaemonClient
 
 
+@skipIfOS('win32', 'Unix domain sockets not supported on windows.')
+class DUSSyncDaemonTestCase(SyncDaemonTestCase):
+    """Test the syncdaemon client class."""
+
+    def get_server(self):
+        """Return the server to be used to run the tests."""
+        return TidyUnixServer()
+
+
 class FileSystemTestCase(IPCTestCase):
     """Test the file system client class."""
 
     client_class = FileSystemClient
 
 
+@skipIfOS('win32', 'Unix domain sockets not supported on windows.')
+class DUSFileSystemTestCase(FileSystemTestCase):
+    """Test the file system client class."""
+
+    def get_server(self):
+        """Return the server to be used to run the tests."""
+        return TidyUnixServer()
+
+
 class SharesTestCase(IPCTestCase):
     """Test the shares client class."""
 
     client_class = SharesClient
 
 
+@skipIfOS('win32', 'Unix domain sockets not supported on windows.')
+class DUSSharesTestCase(SharesTestCase):
+    """Test the shares client class."""
+
+    def get_server(self):
+        """Return the server to be used to run the tests."""
+        return TidyUnixServer()
+
+
 class ConfigTestCase(IPCTestCase):
     """Test the status client class."""
 
     client_class = ConfigClient
 
 
+@skipIfOS('win32', 'Unix domain sockets not supported on windows.')
+class DUSConfigTestCase(ConfigTestCase):
+    """Test the status client class."""
+
+    def get_server(self):
+        """Return the server to be used to run the tests."""
+        return TidyUnixServer()
+
+
 class FoldersTestCase(IPCTestCase):
     """Test the status client class."""
 
     client_class = FoldersClient
 
 
+@skipIfOS('win32', 'Unix domain sockets not supported on windows.')
+class DUSFoldersTestCase(FoldersTestCase):
+    """Test the status client class."""
+
+    def get_server(self):
+        """Return the server to be used to run the tests."""
+        return TidyUnixServer()
+
+
 class PublicFilesTestCase(IPCTestCase):
     """Test the status client class."""
 
     client_class = PublicFilesClient
 
 
+@skipIfOS('win32', 'Unix domain sockets not supported on windows.')
+class DUSPublicFilesTestCase(PublicFilesTestCase):
+    """Test the status client class."""
+
+    def get_server(self):
+        """Return the server to be used to run the tests."""
+        return TidyUnixServer()
+
+
 class RemoteMetaTestCase(TestCase):
     """Tests for the RemoteMeta metaclass."""
 
@@ -666,21 +737,22 @@
         self.assertIsInstance(remote, RemoteReference)
 
 
+@skipIfOS('win32', 'Unix domain sockets not supported on windows.')
+class DUSInterfaceTestCase(IPCInterfaceTestCase):
+    """Ensure that the IPCInterface works as expected."""
+
+    def get_server(self):
+        """Return the server to be used to run the tests."""
+        return TidyUnixServer()
+
+
 class IPCPortTestCase(TestCase):
     """Tests for the ipc port setup."""
 
-    def test_get_sd_pb_port(self):
-        """A test for the get_sd_pb_port function."""
-        sso_port = 50001
-        self.patch(ipc, "get_sso_pb_port", lambda: sso_port)
-        result = ipc.get_sd_pb_port()
-        expected = sso_port + ipc.SD_SSO_PORT_OFFSET
-        self.assertEqual(result, expected)
-
     @defer.inlineCallbacks
     def test_is_already_running_no(self):
         """Test the is_already_running function."""
-        self.patch(ipc.ActivationInstance, "get_port",
+        self.patch(ipc.ActivationInstance, "get_server_description",
                    lambda _: defer.succeed(TEST_PORT))
         is_running = yield ipc.is_already_running()
         self.assertFalse(is_running, "Should not be running.")
@@ -688,7 +760,7 @@
     @defer.inlineCallbacks
     def test_is_already_running_yes(self):
         """Test the is_already_running function."""
-        self.patch(ipc.ActivationInstance, "get_port",
+        self.patch(ipc.ActivationInstance, "get_server_description",
                    lambda _: defer.fail(ipc.AlreadyStartedError()))
         is_running = yield ipc.is_already_running()
         self.assertTrue(is_running, "Should be running by now.")

=== added file 'tests/platform/ipc/test_unix.py'
--- tests/platform/ipc/test_unix.py	1970-01-01 00:00:00 +0000
+++ tests/platform/ipc/test_unix.py	2012-05-22 16:21:33 +0000
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 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/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Tests for the unix ipc."""
+
+from twisted.trial.unittest import TestCase
+
+from ubuntuone.platform.ipc import unix
+
+
+class DescriptionFactoryTestCase(TestCase):
+    """Tests for the description factory test."""
+
+    def test_init(self):
+        """Test that we correctly init the factory."""
+        path = '/path/to/socket'
+
+        self.patch(unix, 'get_u1_domain_socket', lambda: path)
+
+        factory = unix.DescriptionFactory()
+        self.assertEqual(factory.server_description_pattern % path,
+                factory.server)
+        self.assertEqual(factory.client_description_pattern % path,
+                factory.client)
+

=== added file 'tests/platform/ipc/test_windows.py'
--- tests/platform/ipc/test_windows.py	1970-01-01 00:00:00 +0000
+++ tests/platform/ipc/test_windows.py	2012-05-22 16:21:33 +0000
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 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/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Tests for the windows ipc."""
+
+from twisted.trial.unittest import TestCase
+
+from ubuntuone.platform.ipc import windows
+
+
+class IPCPortTestCase(TestCase):
+    """Tests for the ipc port setup."""
+
+    def test_get_sd_pb_port(self):
+        """A test for the get_sd_pb_port function."""
+        sso_port = 50001
+        self.patch(windows, "get_sso_pb_port", lambda: sso_port)
+        result = windows.get_sd_pb_port()
+        expected = sso_port + windows.SD_SSO_PORT_OFFSET
+        self.assertEqual(result, expected)
+
+
+class DescriptionFactoryTestCase(TestCase):
+    """Tests for the description factory test."""
+
+    def test_init(self):
+        """Test that we correctly init the factory."""
+        port = 11111
+        self.patch(windows, 'get_sd_pb_port', lambda: port)
+
+        factory = windows.DescriptionFactory()
+        self.assertEqual(factory.server_description_pattern % port,
+                factory.server)
+        self.assertEqual(factory.client_description_pattern % port,
+                factory.client)
+

=== modified file 'tests/syncdaemon/test_main.py'
--- tests/syncdaemon/test_main.py	2012-04-09 20:07:05 +0000
+++ tests/syncdaemon/test_main.py	2012-05-22 16:21:33 +0000
@@ -65,6 +65,10 @@
         self.connect = lambda *a, **kw: self._called.append(('connect', a, kw))
         self.shutdown = lambda *a, **kw: None
 
+    def start(self):
+        """Do nothing."""
+        return defer.succeed(None)
+
 
 class MainTests(BaseTwistedTestCase):
     """ Basic tests to check main.Main """

=== modified file 'ubuntuone/platform/ipc/__init__.py'
--- ubuntuone/platform/ipc/__init__.py	2012-05-15 14:56:44 +0000
+++ ubuntuone/platform/ipc/__init__.py	2012-05-22 16:21:33 +0000
@@ -31,8 +31,8 @@
 import sys
 
 
-if sys.platform == "win32":
-    from ubuntuone.platform.ipc import windows as source
+if sys.platform in ('win32', 'darwin'):
+    from ubuntuone.platform.ipc import perspective_broker as source
     ExternalInterface = source.IPCInterface
 elif sys.platform == "darwin":
     from ubuntuone.platform.ipc import darwin as source

=== modified file 'ubuntuone/platform/ipc/ipc_client.py'
--- ubuntuone/platform/ipc/ipc_client.py	2012-04-30 14:24:55 +0000
+++ ubuntuone/platform/ipc/ipc_client.py	2012-05-22 16:21:33 +0000
@@ -34,7 +34,10 @@
 from twisted.internet import defer
 from twisted.spread.pb import Referenceable, PBClientFactory
 
-from ubuntuone.platform.ipc.windows import RemoteMeta, ipc_client_connect
+from ubuntuone.platform.ipc.perspective_broker import (
+    RemoteMeta,
+    ipc_client_connect,
+)
 
 logger = logging.getLogger("ubuntuone.SyncDaemon.Client")
 
@@ -786,4 +789,4 @@
     def disconnect(self):
         """Disconnect from the process."""
         if self.client:
-            self.client.disconnect()
+            self.client.transport.loseConnection()

=== modified file 'ubuntuone/platform/ipc/linux.py'
--- ubuntuone/platform/ipc/linux.py	2012-05-02 19:07:59 +0000
+++ ubuntuone/platform/ipc/linux.py	2012-05-22 16:21:33 +0000
@@ -861,6 +861,10 @@
 
         logger.info('DBusInterface initialized.')
 
+    def start(self):
+        """Start listening for ipc messages."""
+        return defer.succeed(None)
+
     def shutdown(self, with_restart=False):
         """Remove the registered object from the bus."""
         logger.info('Shutting down DBusInterface!')

=== renamed file 'ubuntuone/platform/ipc/windows.py' => 'ubuntuone/platform/ipc/perspective_broker.py'
--- ubuntuone/platform/ipc/windows.py	2012-04-30 14:24:55 +0000
+++ ubuntuone/platform/ipc/perspective_broker.py	2012-05-22 16:21:33 +0000
@@ -26,15 +26,16 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""IPC implementation for windows."""
+"""IPC implementation using perspective broker."""
 
 import logging
+import sys
 import warnings
 
 from functools import wraps
 from collections import defaultdict
 
-from twisted.internet import defer, reactor
+from twisted.internet import defer, endpoints
 from twisted.spread.pb import (
     DeadReferenceError,
     NoSuchMethod,
@@ -42,7 +43,7 @@
     Referenceable,
     Root,
 )
-from ubuntu_sso.main.windows import get_activation_cmdline, get_sso_pb_port
+from ubuntu_sso.main import get_activation_cmdline
 from ubuntu_sso.utils.tcpactivation import (
     ActivationClient,
     ActivationConfig,
@@ -50,31 +51,41 @@
     AlreadyStartedError,
 )
 
+# we do not do from package import as source becauser pyflakes will complain
+if sys.platform == 'win32':
+    from ubuntuone.platform.ipc import windows
+    source = windows
+else:
+    from ubuntuone.platform.ipc import unix
+    source = unix
+
+DescriptionFactory = source.DescriptionFactory
+
 logger = logging.getLogger("ubuntuone.SyncDaemon.Pb")
-LOCALHOST = "127.0.0.1"
 SD_SSO_PORT_OFFSET = 1
 SD_SERVICE_NAME = "ubuntuone-syncdaemon"
 CLIENT_NOT_PROCESSED = -1
 
 
-def get_sd_pb_port():
-    """Returns the host and port for this user."""
-    return get_sso_pb_port() + SD_SSO_PORT_OFFSET
-
-
 def get_activation_config():
     """Get the configuration to activate the sso service."""
-    port = get_sd_pb_port()
+    description = DescriptionFactory()
     service_name = SD_SERVICE_NAME
     cmdline = get_activation_cmdline(service_name)
-    return ActivationConfig(service_name, cmdline, port)
-
-
-def ipc_server_listen(server_factory):
+    return ActivationConfig(service_name, cmdline, description)
+
+
[e-mail]
+def ipc_server_listen(server_factory, reactor=None):
     """Connect the IPC server factory."""
-    port = get_sd_pb_port()
-    # pylint: disable=E1101
-    return reactor.listenTCP(port, server_factory, interface=LOCALHOST)
+    description = DescriptionFactory()
+
+    if reactor is None:
+        from twisted.internet import reactor
+
+    server = endpoints.serverFromString(reactor, description.server)
+    connector = yield server.listen(server_factory)
+    defer.returnValue(connector)
 
 
 @defer.inlineCallbacks
@@ -82,20 +93,24 @@
     """Return if the sd is running by trying to get the port."""
     ai = ActivationInstance(get_activation_config())
     try:
-        yield ai.get_port()
+        yield ai.get_server_description()
         defer.returnValue(False)
     except AlreadyStartedError:
         defer.returnValue(True)
 
 
 @defer.inlineCallbacks
-def ipc_client_connect(client_factory):
+def ipc_client_connect(client_factory, reactor=None):
     """Connect the IPC client factory."""
     ac = ActivationClient(get_activation_config())
-    port = yield ac.get_active_port()
-    # pylint: disable=E1101
-    connector = reactor.connectTCP(LOCALHOST, port, client_factory)
-    defer.returnValue(connector)
+
+    if reactor is None:
+        from twisted.internet import reactor
+
+    description = yield ac.get_active_client_description()
+    client = endpoints.clientFromString(reactor, description)
+    port = yield client.connect(client_factory)
+    defer.returnValue(port)
 
 
 def remote_handler(handler):
@@ -951,10 +966,14 @@
         self.public_files = PublicFiles(service)
         self.config = Config(service)
         self.factory = PBServerFactory(self)
-        self.listener = ipc_server_listen(self.factory)
 
         logger.info('IPC initialized.')
 
+    @defer.inlineCallbacks
+    def start(self):
+        """Start listening for ipc messages."""
+        self.listener = yield ipc_server_listen(self.factory)
+
     def shutdown(self, with_restart=False):
         """Remove the registered objects."""
         logger.info('Shutting down IPC!')

=== added file 'ubuntuone/platform/ipc/unix.py'
--- ubuntuone/platform/ipc/unix.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/ipc/unix.py	2012-05-22 16:21:33 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 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/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""IPC implementation for unix."""
+
+import os
+
+from dirspec import basedir
+
+
+def get_u1_domain_socket():
+    """Compute the domain socket for the sso ipc."""
+    path = os.path.join(basedir.xdg_cache_home, 'ubuntuone', 'ipc')
+    return path
+
+
+class DescriptionFactory(object):
+    """Factory that provides the server and client descriptions."""
+
+    client_description_pattern = 'unix:path=%s'
+    server_description_pattern = 'unix:%s'
+
+    def __init__(self):
+        """Create a new instance."""
+        self.domain = get_u1_domain_socket()
+        self.server = self.server_description_pattern % self.domain
+        self.client = self.client_description_pattern % self.domain

=== added file 'ubuntuone/platform/ipc/windows.py'
--- ubuntuone/platform/ipc/windows.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/ipc/windows.py	2012-05-22 16:21:33 +0000
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 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/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""IPC implementation for windows."""
+
+from ubuntu_sso.main.windows import get_sso_pb_port
+
+SD_SSO_PORT_OFFSET = 1
+
+
+def get_sd_pb_port():
+    """Returns the host and port for this user."""
+    return get_sso_pb_port() + SD_SSO_PORT_OFFSET
+
+
+class DescriptionFactory(object):
+    """Factory that provides the server and client descriptions."""
+
+    client_description_pattern = 'tcp:host=127.0.0.1:port=%s'
+    server_description_pattern = 'tcp:%s:interface=127.0.0.1'
+
+    def __init__(self):
+        """Create a new instance."""
+        self.port = get_sd_pb_port()
+        self.server = self.server_description_pattern % self.port
+        self.client = self.client_description_pattern % self.port

=== modified file 'ubuntuone/platform/tools/windows.py'
--- ubuntuone/platform/tools/windows.py	2012-04-30 14:24:55 +0000
+++ ubuntuone/platform/tools/windows.py	2012-05-22 16:21:33 +0000
@@ -36,7 +36,7 @@
 from twisted.internet import defer
 from _winreg import OpenKey, HKEY_LOCAL_MACHINE, QueryValueEx
 
-from ubuntuone.platform.ipc.windows import is_already_running
+from ubuntuone.platform.ipc.perspective_broker import is_already_running
 from ubuntuone.platform.ipc.ipc_client import UbuntuOneClient
 
 

=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2012-05-22 16:21:33 +0000
@@ -1213,6 +1213,11 @@
         self.sync = self  # for API compatibility
 
     @log_call(logger.info)
+    def start(self):
+        """Start listening for ipc messages."""
+        return self.interface.start()
+
+    @log_call(logger.info)
     def shutdown(self, with_restart=False):
         """Shutdown the interface and unsubscribe from the event queue."""
         self.main.event_q.unsubscribe(self.event_listener)

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2012-04-09 20:08:42 +0000
+++ ubuntuone/syncdaemon/main.py	2012-05-22 16:21:33 +0000
@@ -216,6 +216,7 @@
         """Setup the daemon to be ready to run."""
         # hook the event queue to the root dir
         self.event_q.push('SYS_INIT_DONE')
+        return self.external.start()
 
     @defer.inlineCallbacks
     def shutdown(self, with_restart=False):