summaryrefslogtreecommitdiff
path: root/test/py
diff options
context:
space:
mode:
authorRoger Meier <roger@apache.org>2015-09-21 23:11:46 +0200
committerRoger Meier <roger@apache.org>2015-09-21 23:36:27 +0200
commit840f3ef649053ad0c971afd5558ab45a39b6d11d (patch)
treeabdaa0b8cbe0bbe28ba31291591e21122377e4a6 /test/py
parent293e2f450b22a993516c7703645540e72e7d3e85 (diff)
downloadthrift-840f3ef649053ad0c971afd5558ab45a39b6d11d.tar.gz
THRIFT-3340 Python: enable json tests again
This closed #613
Diffstat (limited to 'test/py')
-rwxr-xr-xtest/py/RunClientServer.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/py/RunClientServer.py b/test/py/RunClientServer.py
index a22d81268..b7f43320a 100755
--- a/test/py/RunClientServer.py
+++ b/test/py/RunClientServer.py
@@ -60,9 +60,8 @@ EXTRA_DELAY = dict(TProcessPoolServer=5.5)
PROTOS= [
'accel',
'binary',
- 'compact']
-# FIXME: add json
-# disabled because json HTTP test hangs... why?
+ 'compact',
+ 'json']
SERVERS = [
"TSimpleServer",