Merge branch 'master' of github.com:msgpack/msgpack-rpc-python

Author: repeatedly

test/test_msgpackrpc.py

@@ -70,14 +70,22 @@ def setUp(self):
         self._address = msgpackrpc.Address('localhost', helper.unused_port())
 
     def setup_env(self):
+        def _on_started():
+            self._server._loop.dettach_periodic_callback()
+            lock.release()
         def _start_server(server):
+            server._loop.attach_periodic_callback(_on_started, 1)
             server.start()
             server.close()
 
         self._server = msgpackrpc.Server(TestMessagePackRPC.TestServer())
         self._server.listen(self._address)
         self._thread = threading.Thread(target=_start_server, args=(self._server,))
+
+        lock = threading.Lock()
         self._thread.start()
+        lock.acquire()
+        lock.acquire()   # wait for the server to start
 
         self._client = msgpackrpc.Client(self._address, unpack_encoding='utf-8')
         return self._client;
@@ -160,7 +168,8 @@ def test_async_result(self):
 
     def test_connect_failed(self):
         client = self.setup_env();
-        client = msgpackrpc.Client(msgpackrpc.Address('localhost', self._address.port - 10), unpack_encoding='utf-8')
+        port = helper.unused_port()
+        client = msgpackrpc.Client(msgpackrpc.Address('localhost', port), unpack_encoding='utf-8')
         self.assertRaises(error.TransportError, lambda: client.call('hello'))
 
     def test_timeout(self):