Merge lp:~mandel/ubuntu-sso-client/use-new-dev-tools into lp:ubuntu-sso-client

[Manuel de la Peña]

- Fixed tests to use the new api (LP: #988809).

- Fixed tests to use the new api (LP: #988809).

If the new api has not yet landed in nightlies please add lp:~mandel/ubuntuone-dev-tools/domain-sockets to your path.

[lp:~mandel/ubuntu-sso-client/use-new-dev-tools]

953. By Manuel de la Peña on 2012-04-26

Merge with diegos fix to the timestamp issues on windows.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntu_sso/utils/tests/test_ipc.py'
--- ubuntu_sso/utils/tests/test_ipc.py	2012-04-18 14:30:30 +0000
+++ ubuntu_sso/utils/tests/test_ipc.py	2012-04-26 14:12:30 +0000
@@ -38,7 +38,7 @@
     NoSuchMethod,
 )
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.devtools.testcases.txtcpserver import PbServerTestCase
+from ubuntuone.devtools.testcases.txsocketserver import TCPPbServerTestCase
 
 from ubuntu_sso.tests import TestCase
 from ubuntu_sso.utils import ipc
@@ -186,7 +186,7 @@
     service_cmdline = DummyService.cmdline
 
 
-class BaseIPCTestCase(PbServerTestCase, TestCase):
+class BaseIPCTestCase(TCPPbServerTestCase, TestCase):
     """Set the ipc to a random port for this instance."""
 
     timeout = 5
@@ -217,20 +217,22 @@
             # patch server connection and client connection to ensure that
             # we have clean connections
 
+            @defer.inlineCallbacks
             def server_listen(server_factory, service_name, activation_cmd,
                               port, reactor=None):
                 """Connect to the local running service."""
-                self.listen_server(self.service)
-                return defer.succeed(self.listener)
+                yield self.listen_server(self.service)
+                defer.returnValue(self.listener)
 
             self.patch(ipc, 'server_listen', server_listen)
 
+            @defer.inlineCallbacks
             def client_connect(client_factory, service_name,
                                activation_cmdline, port, reactor=None):
                 """Connect the local running client."""
-                self.connect_client()
+                yield self.connect_client()
                 self.client.factory = self.client_factory
-                return defer.succeed(self.connector)
+                defer.returnValue(self.connector)
 
             self.patch(ipc, 'client_connect', client_connect)
 
@@ -238,7 +240,6 @@
             yield self.service.start()
             yield self.client.connect()
 
-            yield self.client_connected
         # pylint: enable=E1102
 
     @property

=== modified file 'ubuntu_sso/utils/webclient/tests/test_timestamp.py'
--- ubuntu_sso/utils/webclient/tests/test_timestamp.py	2012-04-17 20:27:18 +0000
+++ ubuntu_sso/utils/webclient/tests/test_timestamp.py	2012-04-26 14:12:30 +0000
@@ -71,7 +71,7 @@
 class TimestampCheckerTestCase(TestCase):
     """Tests for the timestamp checker."""
 
-    timeout = 1
+    timeout = 5
 
     @defer.inlineCallbacks
     def setUp(self):