Fix AttributeError on timeout with async

bombela · bombela · commit 74899a7f9f7e · 2013-01-26T18:02:25.000-08:00
oc = zerorpc.Client(connect_to="tcp://127.0.0.1:8003")
oc.test('whats up', async=True).wait()

If there is a timeout:
An exception is raised: "AttributeError: 'str' object has no attribute 'name'"

Thanks jvangael for the bug report.

This patch also add a test case.
diff --git a/tests/test_client_async.py b/tests/test_client_async.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+# Open Source Initiative OSI - The MIT License (MIT):Licensing
+#
+# The MIT License (MIT)
+# Copyright (c) 2013 DotCloud Inc (opensource@dotcloud.com)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do
+# so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+from nose.tools import assert_raises
+import gevent
+
+from zerorpc import zmq
+import zerorpc
+from testutils import teardown, random_ipc_endpoint
+
+
+def test_client_server_client_timeout_with_async():
+    endpoint = random_ipc_endpoint()
+
+    class MySrv(zerorpc.Server):
+
+        def lolita(self):
+            return 42
+
+        def add(self, a, b):
+            gevent.sleep(10)
+            return a + b
+
+    srv = MySrv()
+    srv.bind(endpoint)
+    gevent.spawn(srv.run)
+
+    client = zerorpc.Client(timeout=2)
+    client.connect(endpoint)
+
+    async_result = client.add(1, 4, async=True)
+    with assert_raises(zerorpc.TimeoutExpired):
+        print async_result.get()
+    client.close()
+    srv.close()
+
+
+def test_client_server_with_async():
+    endpoint = random_ipc_endpoint()
+
+    class MySrv(zerorpc.Server):
+
+        def lolita(self):
+            return 42
+
+        def add(self, a, b):
+            return a + b
+
+    srv = MySrv()
+    srv.bind(endpoint)
+    gevent.spawn(srv.run)
+
+    client = zerorpc.Client()
+    client.connect(endpoint)
+
+    async_result = client.lolita(async=True)
+    assert async_result.get() == 42
+
+    async_result = client.add(1, 4, async=True)
+    assert async_result.get() == 5
diff --git a/zerorpc/core.py b/zerorpc/core.py
@@ -241,7 +241,7 @@ def __call__(self, method, *args, **kargs):
                 return self._process_response(request_event, bufchan, timeout)
 
             async_result = gevent.event.AsyncResult()
-            gevent.spawn(self._process_response, method, bufchan,
+            gevent.spawn(self._process_response, request_event, bufchan,
                     timeout).link(async_result)
             return async_result
         except:
