fix benchmark example

examples/benchmark/thrift/client.py

@@ -21,6 +21,7 @@
 # THE SOFTWARE.
 
 import os
+import sys
 import threading
 
 from tornado import gen, ioloop
@@ -43,6 +44,7 @@
 
 def report_work():
     print local.requests
+    sys.stdout.flush()
     local.requests = 0
 
 

examples/benchmark/thrift/server.py

@@ -33,9 +33,9 @@
 values = {'hello': 'world'}
 
 
-@app.register(KeyValue)
-def getValue(request, response):
-    key = request.args.key
+@app.thrift.register(KeyValue)
+def getValue(request):
+    key = request.body.key
     value = values.get(key)
 
     if value is None:
@@ -44,10 +44,10 @@ def getValue(request, response):
     return value
 
 
-@app.register(KeyValue)
-def setValue(request, response):
-    key = request.args.key
-    value = request.args.value
+@app.thrift.register(KeyValue)
+def setValue(request):
+    key = request.body.key
+    value = request.body.value
     values[key] = value
 
 

tests/test_examples.py

@@ -56,6 +56,7 @@ def popen(path, wait_for_listen=False):
         ('raw', 'simple/raw/'),
         ('json', 'simple/json/'),
         ('thrift', 'simple/thrift/'),
+        ('bench', 'benchmark/thrift/'),
         ('guide', 'guide/keyvalue/keyvalue/'),
     )
 )
@@ -75,18 +76,14 @@ def test_example(scheme, path):
     with popen(server_path, wait_for_listen=True):
         with popen(client_path) as client:
 
-            out = client.stdout.read()
+            body = client.stdout.readline().strip()
+            headers = client.stdout.readline().strip()
 
             # TODO the guide test should be the same as others
             if scheme == 'guide':
-                assert out == 'Hello, world!\n'
+                assert body == 'Hello, world!'
                 return
 
-            try:
-                body, headers = out.split(os.linesep)[:-1]
-            except ValueError:
-                raise AssertionError(out + client.stderr.read())
-
             if scheme == 'raw':
 
                 assert body == 'resp body'
@@ -104,6 +101,10 @@ def test_example(scheme, path):
                     'resp': 'header'
                 }
 
+            elif scheme == 'bench':
+                assert int(body)
+                assert int(headers)
+
             elif scheme == 'thrift':
 
                 headers = json.loads(headers)
@@ -112,3 +113,6 @@ def test_example(scheme, path):
                 assert headers == {
                     'resp': 'header',
                 }
+
+            else:
+                assert False