Repository: thrift Updated Branches: refs/heads/master 293e2f450 -> 840f3ef64
THRIFT-3340 Python: enable json tests again This closed #613 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/840f3ef6 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/840f3ef6 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/840f3ef6 Branch: refs/heads/master Commit: 840f3ef649053ad0c971afd5558ab45a39b6d11d Parents: 293e2f4 Author: Roger Meier <[email protected]> Authored: Mon Sep 21 23:11:46 2015 +0200 Committer: Roger Meier <[email protected]> Committed: Mon Sep 21 23:36:27 2015 +0200 ---------------------------------------------------------------------- test/py/RunClientServer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/840f3ef6/test/py/RunClientServer.py ---------------------------------------------------------------------- diff --git a/test/py/RunClientServer.py b/test/py/RunClientServer.py index a22d812..b7f4332 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",
