Changeset 1500

Timestamp:

07/09/08 15:07:58 (4 months ago)

Author:

nick

Message:

Merged source:pyamf/branches/twisted-gateway-tuple-313

Fixes: #313
Author: nick
Reviewer: thijs

Location:

pyamf/trunk/pyamf

Files:

• remoting/gateway/twisted.py (modified) (1 diff)
• tests/gateway/test_twisted.py (modified) (1 diff)

pyamf/trunk/pyamf/remoting/gateway/twisted.py

@@ -69 +69 @@
 
         def response_cb(result):
+            self.gateway.logger.debug("AMF Response: %s" % (result,))
             response.body = result
 
-            self.gateway.logger.debug("AMF Response: %r" % response)
             deferred_response.callback(response)
 

pyamf/trunk/pyamf/tests/gateway/test_twisted.py

@@ -274 +274 @@
         return d.addBoth(switch)
 
+    def test_tuple(self):
+        def echo(data):
+            return data
+
+        self.gw.addService(echo)
+
+        env = remoting.Envelope(pyamf.AMF0, pyamf.ClientTypes.Flash9)
+        request = remoting.Request('echo', body=[('Hi', 'Mom')])
+        env['/1'] = request
+
+        d = client.getPage("http://127.0.0.1:%d/" % (self.port,),
+                method="POST", postdata=remoting.encode(env).getvalue())
+
+        def cb(result):
+            response = remoting.decode(result)
+            body_response = response['/1']
+
+            self.assertEquals(body_response.status, remoting.STATUS_OK)
+            self.assertEquals(body_response.body, ['Hi', 'Mom'])
+
+        return d.addCallback(cb)
+
 class DummyHTTPRequest:
     def __init__(self):