rewrite test as an example w/ simplify

see also
msgpack-rpc/msgpack-rpc#45

test from msgpack-rpc
msgpack-rpc/msgpack-rpc@9b0fe02

Author: TAKANO Mitsuhiro

example/echoserver.py

@@ -2,35 +2,26 @@
 # coding: utf-8
 
 """Echo service.
-This server doesn't use msgpackrpc.server.
+This server using msgpackrpc.Server.
 """
 
-import SocketServer
-from msgpack import packs, Unpacker
+import msgpackrpc
 
-class EchoHandler(SocketServer.BaseRequestHandler):
+class EchoHandler(object):
 
-    def handle(self):
-        unpacker = Unpacker()
-
-        while 1:
-            data = self.request.recv(4096)
-            if len(data) == 0:
-                break
-            unpacker.feed(data)
-            for msg in unpacker:
-                print msg
-                assert len(msg) == 4
-                assert msg[0] == 0
-                assert msg[2] == "echo"
-                sdata = packs((1, msg[1], None, msg[-1]))
-                self.request.sendall(sdata)
+    def echo(self, msg):
+        return msg
 
 def serve_background(server, daemon=False):
+    def _start_server(server):
+        server.start()
+        server.close()
+
     import threading
-    t = threading.Thread(target=server.serve_forever)
+    t = threading.Thread(target=_start_server, args = (server,))
     t.setDaemon(daemon)
     t.start()
+    return t
 
 def serve(daemon=False):
     """Serve echo server in background on localhost.
@@ -40,12 +31,17 @@ def serve(daemon=False):
     """
     for port in xrange(9000, 10000):
         try:
-            server = SocketServer.TCPServer(('localhost', port), EchoHandler)
-            serve_background(server, daemon)
-            return server, port
-        except Exception:
+            addr = msgpackrpc.Address('localhost', port)
+            server = msgpackrpc.Server(EchoHandler())
+            print server
+            server.listen(addr)
+            thread = serve_background(server, daemon)
+            return (addr, server, thread)
+        except Exception as err:
+            print err
             pass
 
 if __name__ == '__main__':
     port = serve(False)
     print "Serving on localhost:%d\n" % port[1]
+

example/test_client.py

@@ -1,34 +1,40 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-from msgpackrpc.client import *
-from msgpackrpc.transport import tcp
-
+import msgpackrpc
 import echoserver
 
-SERVER = PORT = None
+ADDR = SERVER = THREAD = None
+
 
 def setup():
-    global SERVER, PORT
-    SERVER, PORT = echoserver.serve()
+    global ADDR, SERVER, THREAD
+    (ADDR, SERVER, THREAD) = echoserver.serve()
+
 
 def teardown():
-    global SERVER, PORT
-    SERVER.shutdown()
-    SERVER = PORT = None
+    global SERVER, THREAD
+    SERVER.stop()
+    THREAD.join()
+
 
 def test_client():
-    client = Client(tcp.TCPTransport, ('localhost', PORT), {})
+    global ADDR
+    client = msgpackrpc.Client(ADDR, unpack_encoding = 'utf-8')
 
-    f1 = client.send_request('echo', 'foo')
-    f2 = client.send_request('echo', 'bar')
-    f3 = client.send_request('echo', 'baz')
+    f1 = client.call('echo', 'foo')
+    f2 = client.call('echo', 'bar')
+    f3 = client.call('echo', 'baz')
+
+    assert f2 == 'bar'
+    assert f1 == 'foo'
+    assert f3 == 'baz'
+
+    print "EchoHandler#echo via msgpackrpc"
 
-    assert f2.result() == 'bar'
-    assert f1.result() == 'foo'
-    assert f3.result() == 'baz'
 
 if __name__ == '__main__':
     setup()
     test_client()
     teardown()
+