From e451b8077ed0e8bb9c39ca2a2fd636179aec4c44 Mon Sep 17 00:00:00 2001 From: cdwijayarathna Date: Wed, 9 Jul 2014 14:00:33 +0530 Subject: [PATCH 1/4] THRIFT-2578 Moving 'make cross' from test.sh to test.py --- test/result.html | 39 ++++++++++++++++ test/test.py | 114 +++++++++++++++++++++++++++++++++++++---------- test/tests.json | 6 ++- 3 files changed, 134 insertions(+), 25 deletions(-) create mode 100644 test/result.html mode change 100755 => 100644 test/test.py diff --git a/test/result.html b/test/result.html new file mode 100644 index 00000000000..ed98261808a --- /dev/null +++ b/test/result.html @@ -0,0 +1,39 @@ + + + + +Apache Thrift - integration test suite + + + + + + +

Apache Thrift - integration test suite: Results

+ + + + + + + + + + +
ServerClientProtocolTransportResult (log)
+ + diff --git a/test/test.py b/test/test.py old mode 100755 new mode 100644 index 0111a2f050a..cab942e9286 --- a/test/test.py +++ b/test/test.py @@ -46,18 +46,30 @@ def relfile(fname): return os.path.join(os.path.dirname(__file__), fname) -def runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, transport, port, use_zlib, use_ssl): +def getSocketArgs(socket_type): + if socket_type == 'ip': + return "" + elif socket_type == 'ip-ssl': + return "--ssl" + elif socket_type == 'domain': + return "--domain-socket=/tmp/ThriftTest.thrift" + +def runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, server_protocol, client_protocol, transport, port, use_zlib, socket_type): # Build command line arguments server_args = [relfile(server_executable)] cli_args = [relfile(client_executable)] + server_args.append('--protocol=%s' % server_protocol) + cli_args.append('--protocol=%s' % client_protocol) + 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: + if socket_type == 'ip-ssl': which.append('--ssl') + elif socket_type == 'domain': + which.append('--domain-socket=/tmp/ThriftTest.thrift') # if options.verbose == 0: # which.append('-q') # if options.verbose == 2: @@ -73,7 +85,7 @@ def runServiceTest(test_name, server_executable, server_extra_args, client_execu serverproc = subprocess.Popen(server_args, stdout=server_log, stderr=server_log) else: serverproc = subprocess.Popen(server_args, stdout=server_log, stderr=server_log) - + def ensureServerAlive(): if serverproc.poll() is not None: print ('FAIL: Server process (%s) failed with retcode %d' @@ -87,13 +99,15 @@ def ensureServerAlive(): 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) + + if socket_type != 'domain': + 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() @@ -142,12 +156,15 @@ def target(): if os.path.exists('log'): shutil.rmtree('log') os.makedirs('log') +if os.path.exists('results.json'): os.remove('results.json') +results_json = open("results.json","a") +results_json.write("[\n") -with open('tests.json') as data_file: +with open('tests.json') as data_file: data = json.load(data_file) #subprocess.call("export NODE_PATH=../lib/nodejs/test:../lib/nodejs/lib:${NODE_PATH}") - +count = 0 for server in data["server"]: server_executable = server["executable"] server_extra_args = "" @@ -166,22 +183,73 @@ def target(): if protocol in client["protocols"]: if transport in client["transports"]: if sock in client["sockets"]: + if count != 0: + results_json.write(",\n") + count = 1 + results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"" + protocol + "\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) test_name = server_lib + "_" + client_lib + "_" + protocol + "_" + transport + "_" + sock + ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, protocol, transport, 9090, 0, sock) + if ret != None: + failed += 1 + print "Error: %s" % ret + print "Using" + print (' Server: %s --protocol=%s --transport=%s %s %s' + % (server_executable, protocol, transport, getSocketArgs(sock), ' '.join(server_extra_args))) + print (' Client: %s --protocol=%s --transport=%s %s %s' + % (client_executable, protocol, transport, getSocketArgs(sock), ''.join(client_extra_args))) + results_json.write("\t\t\"failure (client, server)\"\n") + else: + results_json.write("\t\t\"success (client, server)\"\n") + results_json.write("\t]") + test_count += 1 + if protocol == 'binary' and 'accel' in client["protocols"]: + if transport in client["transports"]: + if sock in client["sockets"]: + if count != 0: + results_json.write(",\n") + count = 1 + results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"accel-binary\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) + test_name = server_lib + "_" + client_lib + "_accel-binary_" + transport + "_" + sock + ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, 'accel', transport, 9090, 0, sock) + if ret != None: + failed += 1 + print "Error: %s" % ret + print "Using" + print (' Server: %s --protocol=%s --transport=%s %s %s' + % (server_executable, protocol, transport, getSocketArgs(sock), ' '.join(server_extra_args))) + print (' Client: %s --protocol=%s --transport=%s %s %s' + % (client_executable, protocol, transport , getSocketArgs(sock), ''.join(client_extra_args))) + results_json.write("\t\t\"failure (client, server)\"\n") + else: + results_json.write("\t\t\"success (client, server)\"\n") + results_json.write("\t]") + test_count += 1 + if protocol == 'accel' and 'binary' in client["protocols"]: + if transport in client["transports"]: + if sock in client["sockets"]: + if count != 0: + results_json.write(",\n") + count = 1 + results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"binary-accel\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) + test_name = server_lib + "_" + client_lib + "_accel-binary_" + transport + "_" + sock ssl = 0 if sock == 'ip-ssl': ssl = 1 - ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, transport, 9090, 0, ssl) + ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, 'binary', transport, 9090, 0, sock) 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))) - - + print (' Server: %s --protocol=%s --transport=%s %s %s' + % (server_executable, protocol, transport + sock, getSocketArgs(sock), ' '.join(server_extra_args))) + print (' Client: %s --protocol=%s --transport=%s %s %s' + % (client_executable, protocol, transport + sock, getSocketArgs(sock), ''.join(client_extra_args))) + results_json.write("\t\t\"failure (client, server)\"\n") + else: + results_json.write("\t\t\"success (client, server)\"\n") + results_json.write("\t]") test_count += 1 - -print '%s failed of %s tests in total' % (failed, test_count) - +results_json.write("\n]") +results_json.flush() +results_json.close() +print '%s failed of %s tests in total' % (failed, test_count) \ No newline at end of file diff --git a/test/tests.json b/test/tests.json index b5cab60516d..515aa4999a0 100644 --- a/test/tests.json +++ b/test/tests.json @@ -36,7 +36,8 @@ ], "sockets": [ "ip", - "ip-ssl" + "ip-ssl", + "domain" ] }, { @@ -114,7 +115,8 @@ ], "sockets": [ "ip", - "ip-ssl" + "ip-ssl", + "domain" ] }, { From 0fdd2148af1ea4e3be79ec05a76ea31af0f2b082 Mon Sep 17 00:00:00 2001 From: cdwijayarathna Date: Sat, 26 Jul 2014 23:02:13 +0530 Subject: [PATCH 2/4] THRIFT-2578 Moving 'make cross' from test.sh to test.py --- test/test.py | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/test/test.py b/test/test.py index cab942e9286..c281ccdae6e 100644 --- a/test/test.py +++ b/test/test.py @@ -80,18 +80,18 @@ def runServiceTest(test_name, server_executable, server_extra_args, client_execu server_log=open("log/" + test_name + "_server.log","a") client_log=open("log/" + test_name + "_client.log","a") - if options.verbose > 0: - print 'Testing server: %s' % (' '.join(server_args)) - serverproc = subprocess.Popen(server_args, stdout=server_log, stderr=server_log) - else: - serverproc = subprocess.Popen(server_args, stdout=server_log, stderr=server_log) + try: + if options.verbose > 0: + print 'Testing server: %s' % (' '.join(server_args)) + serverproc = subprocess.Popen(server_args, stdout=server_log, stderr=server_log) + else: + serverproc = subprocess.Popen(server_args, stdout=server_log, stderr=server_log) + except OSError as e: + return "OS error({0}): {1}".format(e.errno, e.strerror) 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))) + return 'Server subprocess died, args: %s' % (' '.join(server_args)) # Wait for the server to start accepting connections on the given port. sock = socket.socket() @@ -104,8 +104,7 @@ def ensureServerAlive(): 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)) + return "TestServer not ready on port %d after %.2f seconds" % (port, sleep_time * attempt) ensureServerAlive() time.sleep(sleep_time) finally: @@ -114,15 +113,20 @@ def ensureServerAlive(): try: o = [] def target(): - if options.verbose > 0: - print 'Testing client: %s' % (' '.join(cli_args)) - process = subprocess.Popen(cli_args, stdout=client_log, stderr=client_log) - o.append(process) - process.communicate() - else: - process = subprocess.Popen(cli_args, stdout=client_log, stderr=client_log) - o.append(process) - process.communicate() + try: + if options.verbose > 0: + print 'Testing client: %s' % (' '.join(cli_args)) + process = subprocess.Popen(cli_args, stdout=client_log, stderr=client_log) + o.append(process) + process.communicate() + else: + process = subprocess.Popen(cli_args, stdout=client_log, stderr=client_log) + o.append(process) + process.communicate() + except OSError as e: + return "OS error({0}): {1}".format(e.errno, e.strerror) + except: + return "Unexpected error:", sys.exc_info()[0] thread = threading.Thread(target=target) thread.start() @@ -131,6 +135,8 @@ def target(): print 'Terminating process' o[0].terminate() thread.join() + if(len(o)==0): + return "Client subprocess failed, args: %s" % (' '.join(cli_args)) ret = o[0].returncode if ret != 0: return "Client subprocess failed, retcode=%d, args: %s" % (ret, ' '.join(cli_args)) From 81da564e6e9302b56c678062993b0a35084baaa5 Mon Sep 17 00:00:00 2001 From: cdwijayarathna Date: Mon, 28 Jul 2014 21:54:56 +0530 Subject: [PATCH 3/4] THRIFT-2578 Moving 'make cross' from test.sh to test.py --- test/test.py | 149 ++++++++++++++++++++++++------------------------ test/tests.json | 24 ++++++++ 2 files changed, 98 insertions(+), 75 deletions(-) diff --git a/test/test.py b/test/test.py index c281ccdae6e..0eb22c3e58d 100644 --- a/test/test.py +++ b/test/test.py @@ -27,6 +27,7 @@ import os import signal import json +import platform import shutil import threading from optparse import OptionParser @@ -159,7 +160,7 @@ def target(): test_count = 0 failed = 0 - +platform = platform.system() if os.path.exists('log'): shutil.rmtree('log') os.makedirs('log') if os.path.exists('results.json'): os.remove('results.json') @@ -181,80 +182,78 @@ def target(): for transport in server["transports"]: for sock in server["sockets"]: for client in data["client"]: - client_executable = client["executable"] - client_extra_args = "" - client_lib = client["lib"] - if "extra_args" in client: - client_extra_args = client["extra_args"] - if protocol in client["protocols"]: - if transport in client["transports"]: - if sock in client["sockets"]: - if count != 0: - results_json.write(",\n") - count = 1 - results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"" + protocol + "\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) - test_name = server_lib + "_" + client_lib + "_" + protocol + "_" + transport + "_" + sock - ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, protocol, transport, 9090, 0, sock) - if ret != None: - failed += 1 - print "Error: %s" % ret - print "Using" - print (' Server: %s --protocol=%s --transport=%s %s %s' - % (server_executable, protocol, transport, getSocketArgs(sock), ' '.join(server_extra_args))) - print (' Client: %s --protocol=%s --transport=%s %s %s' - % (client_executable, protocol, transport, getSocketArgs(sock), ''.join(client_extra_args))) - results_json.write("\t\t\"failure (client, server)\"\n") - else: - results_json.write("\t\t\"success (client, server)\"\n") - results_json.write("\t]") - test_count += 1 - if protocol == 'binary' and 'accel' in client["protocols"]: - if transport in client["transports"]: - if sock in client["sockets"]: - if count != 0: - results_json.write(",\n") - count = 1 - results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"accel-binary\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) - test_name = server_lib + "_" + client_lib + "_accel-binary_" + transport + "_" + sock - ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, 'accel', transport, 9090, 0, sock) - if ret != None: - failed += 1 - print "Error: %s" % ret - print "Using" - print (' Server: %s --protocol=%s --transport=%s %s %s' - % (server_executable, protocol, transport, getSocketArgs(sock), ' '.join(server_extra_args))) - print (' Client: %s --protocol=%s --transport=%s %s %s' - % (client_executable, protocol, transport , getSocketArgs(sock), ''.join(client_extra_args))) - results_json.write("\t\t\"failure (client, server)\"\n") - else: - results_json.write("\t\t\"success (client, server)\"\n") - results_json.write("\t]") - test_count += 1 - if protocol == 'accel' and 'binary' in client["protocols"]: - if transport in client["transports"]: - if sock in client["sockets"]: - if count != 0: - results_json.write(",\n") - count = 1 - results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"binary-accel\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) - test_name = server_lib + "_" + client_lib + "_accel-binary_" + transport + "_" + sock - ssl = 0 - if sock == 'ip-ssl': - ssl = 1 - ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, 'binary', transport, 9090, 0, sock) - if ret != None: - failed += 1 - print "Error: %s" % ret - print "Using" - print (' Server: %s --protocol=%s --transport=%s %s %s' - % (server_executable, protocol, transport + sock, getSocketArgs(sock), ' '.join(server_extra_args))) - print (' Client: %s --protocol=%s --transport=%s %s %s' - % (client_executable, protocol, transport + sock, getSocketArgs(sock), ''.join(client_extra_args))) - results_json.write("\t\t\"failure (client, server)\"\n") - else: - results_json.write("\t\t\"success (client, server)\"\n") - results_json.write("\t]") - test_count += 1 + if platform in server["platform"] and platform in client["platform"]: + client_executable = client["executable"] + client_extra_args = "" + client_lib = client["lib"] + if "extra_args" in client: + client_extra_args = client["extra_args"] + if protocol in client["protocols"]: + if transport in client["transports"]: + if sock in client["sockets"]: + if count != 0: + results_json.write(",\n") + count = 1 + results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"" + protocol + "\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) + test_name = server_lib + "_" + client_lib + "_" + protocol + "_" + transport + "_" + sock + ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, protocol, transport, 9090, 0, sock) + if ret != None: + failed += 1 + print "Error: %s" % ret + print "Using" + print (' Server: %s --protocol=%s --transport=%s %s %s' + % (server_executable, protocol, transport, getSocketArgs(sock), ' '.join(server_extra_args))) + print (' Client: %s --protocol=%s --transport=%s %s %s' + % (client_executable, protocol, transport, getSocketArgs(sock), ''.join(client_extra_args))) + results_json.write("\t\t\"failure (client, server)\"\n") + else: + results_json.write("\t\t\"success (client, server)\"\n") + results_json.write("\t]") + test_count += 1 + if protocol == 'binary' and 'accel' in client["protocols"]: + if transport in client["transports"]: + if sock in client["sockets"]: + if count != 0: + results_json.write(",\n") + count = 1 + results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"accel-binary\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) + test_name = server_lib + "_" + client_lib + "_accel-binary_" + transport + "_" + sock + ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, 'accel', transport, 9090, 0, sock) + if ret != None: + failed += 1 + print "Error: %s" % ret + print "Using" + print (' Server: %s --protocol=%s --transport=%s %s %s' + % (server_executable, protocol, transport, getSocketArgs(sock), ' '.join(server_extra_args))) + print (' Client: %s --protocol=%s --transport=%s %s %s' + % (client_executable, protocol, transport , getSocketArgs(sock), ''.join(client_extra_args))) + results_json.write("\t\t\"failure (client, server)\"\n") + else: + results_json.write("\t\t\"success (client, server)\"\n") + results_json.write("\t]") + test_count += 1 + if protocol == 'accel' and 'binary' in client["protocols"]: + if transport in client["transports"]: + if sock in client["sockets"]: + if count != 0: + results_json.write(",\n") + count = 1 + results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"binary-accel\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) + test_name = server_lib + "_" + client_lib + "_accel-binary_" + transport + "_" + sock + ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, 'binary', transport, 9090, 0, sock) + if ret != None: + failed += 1 + print "Error: %s" % ret + print "Using" + print (' Server: %s --protocol=%s --transport=%s %s %s' + % (server_executable, protocol, transport + sock, getSocketArgs(sock), ' '.join(server_extra_args))) + print (' Client: %s --protocol=%s --transport=%s %s %s' + % (client_executable, protocol, transport + sock, getSocketArgs(sock), ''.join(client_extra_args))) + results_json.write("\t\t\"failure (client, server)\"\n") + else: + results_json.write("\t\t\"success (client, server)\"\n") + results_json.write("\t]") + test_count += 1 results_json.write("\n]") results_json.flush() results_json.close() diff --git a/test/tests.json b/test/tests.json index 515aa4999a0..234384f66af 100644 --- a/test/tests.json +++ b/test/tests.json @@ -18,6 +18,9 @@ "sockets": [ "ip", "ip-ssl" + ], + "platform": [ + "Linux" ] }, { @@ -38,6 +41,9 @@ "ip", "ip-ssl", "domain" + ], + "platform": [ + "Linux" ] }, { @@ -56,6 +62,9 @@ "sockets": [ "ip", "ip-ssl" + ], + "platform": [ + "Linux" ] }, { @@ -74,6 +83,9 @@ ], "sockets": [ "ip" + ], + "platform": [ + "Linux" ] } ], @@ -97,6 +109,9 @@ "sockets": [ "ip", "ip-ssl" + ], + "platform": [ + "Linux" ] }, { @@ -117,6 +132,9 @@ "ip", "ip-ssl", "domain" + ], + "platform": [ + "Linux" ] }, { @@ -135,6 +153,9 @@ ], "sockets": [ "ip" + ], + "platform": [ + "Linux" ] }, { @@ -153,6 +174,9 @@ "sockets": [ "ip", "ip-ssl" + ], + "platform": [ + "Linux" ] } ] From 55e64821ed116daacd10501f6c6c1b53703e552e Mon Sep 17 00:00:00 2001 From: cdwijayarathna Date: Tue, 29 Jul 2014 00:46:44 +0530 Subject: [PATCH 4/4] THRIFT-2578 Moving 'make cross' from test.sh to test.py --- test/result.html | 17 ++++++++++++----- test/test.py | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/test/result.html b/test/result.html index ed98261808a..f1ca3c97e08 100644 --- a/test/result.html +++ b/test/result.html @@ -7,19 +7,26 @@ diff --git a/test/test.py b/test/test.py index 0eb22c3e58d..1dfadb26c0f 100644 --- a/test/test.py +++ b/test/test.py @@ -205,10 +205,10 @@ def target(): % (server_executable, protocol, transport, getSocketArgs(sock), ' '.join(server_extra_args))) print (' Client: %s --protocol=%s --transport=%s %s %s' % (client_executable, protocol, transport, getSocketArgs(sock), ''.join(client_extra_args))) - results_json.write("\t\t\"failure (client, server)\"\n") + results_json.write("\t\t\"failure\",\n") else: - results_json.write("\t\t\"success (client, server)\"\n") - results_json.write("\t]") + results_json.write("\t\t\"success\",\n") + results_json.write("\t\t{\n\t\t\t\"Client\":\"log/" + test_name + "_client.log\",\n\t\t\t\"Server\":\"log/" + test_name + "_server.log\"\n\t\t}\n\t]") test_count += 1 if protocol == 'binary' and 'accel' in client["protocols"]: if transport in client["transports"]: @@ -227,10 +227,10 @@ def target(): % (server_executable, protocol, transport, getSocketArgs(sock), ' '.join(server_extra_args))) print (' Client: %s --protocol=%s --transport=%s %s %s' % (client_executable, protocol, transport , getSocketArgs(sock), ''.join(client_extra_args))) - results_json.write("\t\t\"failure (client, server)\"\n") + results_json.write("\t\t\"failure\",\n") else: - results_json.write("\t\t\"success (client, server)\"\n") - results_json.write("\t]") + results_json.write("\t\t\"success\",\n") + results_json.write("\t\t{\n\t\t\t\"Client\":\"log/" + test_name + "_client.log\",\n\t\t\t\"Server\":\"log/" + test_name + "_server.log\"\n\t\t}\n\t]") test_count += 1 if protocol == 'accel' and 'binary' in client["protocols"]: if transport in client["transports"]: @@ -239,7 +239,7 @@ def target(): results_json.write(",\n") count = 1 results_json.write("\t[\n\t\t\"" + server_lib + "\",\n\t\t\"" + client_lib + "\",\n\t\t\"binary-accel\",\n\t\t\"" + transport + "-" + sock + "\",\n" ) - test_name = server_lib + "_" + client_lib + "_accel-binary_" + transport + "_" + sock + test_name = server_lib + "_" + client_lib + "_binary-accel_" + transport + "_" + sock ret = runServiceTest(test_name, server_executable, server_extra_args, client_executable, client_extra_args, protocol, 'binary', transport, 9090, 0, sock) if ret != None: failed += 1 @@ -249,10 +249,10 @@ def target(): % (server_executable, protocol, transport + sock, getSocketArgs(sock), ' '.join(server_extra_args))) print (' Client: %s --protocol=%s --transport=%s %s %s' % (client_executable, protocol, transport + sock, getSocketArgs(sock), ''.join(client_extra_args))) - results_json.write("\t\t\"failure (client, server)\"\n") + results_json.write("\t\t\"failure\",\n") else: - results_json.write("\t\t\"success (client, server)\"\n") - results_json.write("\t]") + results_json.write("\t\t\"success\",\n") + results_json.write("\t\t{\n\t\t\t\"Client\":\"log/" + test_name + "_client.log\",\n\t\t\t\"Server\":\"log/" + test_name + "_server.log\"\n\t\t}\n\t]") test_count += 1 results_json.write("\n]") results_json.flush()