mirror of
https://github.com/valitydev/thrift.git
synced 2024-11-07 02:45:22 +00:00
THRIFT-847 Test Framework harmonization across all languages
initial version of test.py and tests.json Patch: Roger Meier
This commit is contained in:
Roger Meier
parent
bbac92453b
commit
40cc23269d
151
test/test.py
Executable file
151
test/test.py
Executable file
@ -0,0 +1,151 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you under the Apache License, Version 2.0 (the
|
||||
# "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
|
||||
from __future__ import division
|
||||
import time
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import os
|
||||
import signal
|
||||
import json
|
||||
from optparse import OptionParser
|
||||
|
||||
parser = OptionParser()
|
||||
parser.add_option("--port", type="int", dest="port", default=9090,
|
||||
help="port number for server to listen on")
|
||||
parser.add_option('-v', '--verbose', action="store_const",
|
||||
dest="verbose", const=2,
|
||||
help="verbose output")
|
||||
parser.add_option('-q', '--quiet', action="store_const",
|
||||
dest="verbose", const=0,
|
||||
help="minimal output")
|
||||
parser.set_defaults(verbose=1)
|
||||
options, args = parser.parse_args()
|
||||
|
||||
def relfile(fname):
|
||||
return os.path.join(os.path.dirname(__file__), fname)
|
||||
|
||||
def runServiceTest(server_executable, server_extra_args, client_executable, client_extra_args, protocol, transport, port, use_zlib, use_ssl):
|
||||
# Build command line arguments
|
||||
server_args = [relfile(server_executable)]
|
||||
cli_args = [relfile(client_executable)]
|
||||
for which in (server_args, cli_args):
|
||||
which.append('--protocol=%s' % protocol) # accel, binary or compact
|
||||
which.append('--transport=%s' % transport)
|
||||
which.append('--port=%d' % port) # default to 9090
|
||||
if use_zlib:
|
||||
which.append('--zlib')
|
||||
if use_ssl:
|
||||
which.append('--ssl')
|
||||
# if options.verbose == 0:
|
||||
# which.append('-q')
|
||||
# if options.verbose == 2:
|
||||
# which.append('-v')
|
||||
|
||||
server_args.extend(server_extra_args)
|
||||
cli_args.extend(client_extra_args)
|
||||
|
||||
if options.verbose > 0:
|
||||
print 'Testing server: %s' % (' '.join(server_args))
|
||||
serverproc = subprocess.Popen(server_args)
|
||||
else:
|
||||
serverproc = subprocess.Popen(server_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
|
||||
def ensureServerAlive():
|
||||
if serverproc.poll() is not None:
|
||||
print ('FAIL: Server process (%s) failed with retcode %d'
|
||||
% (' '.join(server_args), serverproc.returncode))
|
||||
raise Exception('Server subprocess died, args: %s'
|
||||
% (' '.join(server_args)))
|
||||
|
||||
# Wait for the server to start accepting connections on the given port.
|
||||
sock = socket.socket()
|
||||
sleep_time = 0.1 # Seconds
|
||||
max_attempts = 100
|
||||
try:
|
||||
attempt = 0
|
||||
while sock.connect_ex(('127.0.0.1', port)) != 0:
|
||||
attempt += 1
|
||||
if attempt >= max_attempts:
|
||||
raise Exception("TestServer not ready on port %d after %.2f seconds"
|
||||
% (port, sleep_time * attempt))
|
||||
ensureServerAlive()
|
||||
time.sleep(sleep_time)
|
||||
finally:
|
||||
sock.close()
|
||||
|
||||
try:
|
||||
if options.verbose > 0:
|
||||
print 'Testing client: %s' % (' '.join(cli_args))
|
||||
ret = subprocess.call(cli_args)
|
||||
else:
|
||||
ret = subprocess.call(cli_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
if ret != 0:
|
||||
return "Client subprocess failed, retcode=%d, args: %s" % (ret, ' '.join(cli_args))
|
||||
#raise Exception("Client subprocess failed, retcode=%d, args: %s" % (ret, ' '.join(cli_args)))
|
||||
finally:
|
||||
# check that server didn't die
|
||||
ensureServerAlive()
|
||||
extra_sleep = 0
|
||||
if extra_sleep > 0 and options.verbose > 0:
|
||||
print ('Giving (protocol=%s,zlib=%s,ssl=%s) an extra %d seconds for child'
|
||||
'processes to terminate via alarm'
|
||||
% (protocol, use_zlib, use_ssl, extra_sleep))
|
||||
time.sleep(extra_sleep)
|
||||
os.kill(serverproc.pid, signal.SIGKILL)
|
||||
serverproc.wait()
|
||||
|
||||
test_count = 0
|
||||
failed = 0
|
||||
|
||||
with open('tests.json') as data_file:
|
||||
data = json.load(data_file)
|
||||
|
||||
for server in data["server"]:
|
||||
server_executable = server["executable"]
|
||||
server_extra_args = ""
|
||||
if "extra_args" in server:
|
||||
server_extra_args = server["extra_args"]
|
||||
for protocol in server["protocols"]:
|
||||
for transport in server["transports"]:
|
||||
for client in data["client"]:
|
||||
client_executable = client["executable"]
|
||||
client_extra_args = ""
|
||||
if "extra_args" in client:
|
||||
client_extra_args = client["extra_args"]
|
||||
if protocol in client["protocols"]:
|
||||
if transport in client["transports"]:
|
||||
ret = runServiceTest(server_executable, server_extra_args, client_executable, client_extra_args, protocol, transport, 9090, 0, 0)
|
||||
if ret != None:
|
||||
failed += 1
|
||||
print "Error: %s" % ret
|
||||
print "Using"
|
||||
print (' Server: %s --protocol=%s --transport=%s %s'
|
||||
% (server_executable, protocol, transport, ' '.join(server_extra_args)))
|
||||
print (' Client: %s --protocol=%s --transport=%s %s'
|
||||
% (client_executable, protocol, transport, ''.join(client_extra_args)))
|
||||
|
||||
|
||||
test_count += 1
|
||||
|
||||
print '%s failed of %s tests in total' % (failed, test_count)
|
||||
|
||||
67
test/tests.json
Normal file
67
test/tests.json
Normal file
@ -0,0 +1,67 @@
|
||||
{
|
||||
"client": [
|
||||
{
|
||||
"description": "Python TestClient",
|
||||
"lib": "py",
|
||||
"executable": "py/TestClient.py",
|
||||
"extra_args": ["--genpydir=py/gen-py"],
|
||||
"protocols": [
|
||||
"binary",
|
||||
"compact",
|
||||
"json"
|
||||
],
|
||||
"transports": [
|
||||
"buffered",
|
||||
"framed"
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "C++ TestClient",
|
||||
"lib": "cpp",
|
||||
"executable": "cpp/TestClient",
|
||||
"protocols": [
|
||||
"binary",
|
||||
"compact",
|
||||
"json"
|
||||
],
|
||||
"transports": [
|
||||
"buffered",
|
||||
"framed",
|
||||
"http"
|
||||
]
|
||||
}
|
||||
],
|
||||
"server": [
|
||||
{
|
||||
"description": "Python TSimpleServer",
|
||||
"lib": "py",
|
||||
"executable": "py/TestServer.py",
|
||||
"extra_args": ["--genpydir=py/gen-py", "TSimpleServer"],
|
||||
"extra_delay": 0,
|
||||
"protocols": [
|
||||
"binary",
|
||||
"compact",
|
||||
"json"
|
||||
],
|
||||
"transports": [
|
||||
"buffered",
|
||||
"framed"
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "C++ TestServer",
|
||||
"lib": "cpp",
|
||||
"executable": "cpp/TestServer",
|
||||
"protocols": [
|
||||
"binary",
|
||||
"compact",
|
||||
"json"
|
||||
],
|
||||
"transports": [
|
||||
"buffered",
|
||||
"framed",
|
||||
"http"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user