Configure client tests for valgrind.
This commit is contained in:
parent
864f1f0d23
commit
fd9496433c
@ -43,7 +43,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
@ -57,7 +57,7 @@ try:
|
||||
|
||||
conn.close()
|
||||
finally:
|
||||
client.terminate()
|
||||
#client.terminate()
|
||||
client.wait()
|
||||
sock.close()
|
||||
|
||||
|
@ -43,7 +43,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -37,7 +37,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -37,7 +37,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -39,7 +39,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -41,7 +41,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -51,7 +51,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -51,7 +51,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -51,7 +51,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -41,7 +41,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -50,7 +50,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -57,7 +57,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -43,7 +43,7 @@ except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -56,7 +56,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -45,7 +45,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -63,7 +63,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -62,7 +62,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -47,7 +47,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -47,7 +47,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -38,7 +38,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = sock.accept()
|
||||
|
@ -30,7 +30,7 @@ except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
client.wait()
|
||||
|
||||
rc = client.returncode
|
||||
|
@ -52,7 +52,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = ssock.accept()
|
||||
|
@ -52,7 +52,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = ssock.accept()
|
||||
|
@ -49,7 +49,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = ssock.accept()
|
||||
|
@ -36,7 +36,7 @@ try:
|
||||
except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
|
||||
try:
|
||||
(conn, address) = ssock.accept()
|
||||
|
@ -22,7 +22,7 @@ except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
client.wait()
|
||||
if client.returncode:
|
||||
(stdo, stde) = client.communicate()
|
||||
|
@ -22,6 +22,6 @@ except KeyError:
|
||||
pp = ''
|
||||
env['PYTHONPATH'] = '../../lib/python:'+pp
|
||||
|
||||
client = subprocess.Popen(client_args, env=env)
|
||||
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env)
|
||||
client.wait()
|
||||
exit(client.returncode)
|
||||
|
@ -28,6 +28,14 @@ def start_broker(filename, cmd=None, port=1888):
|
||||
return broker
|
||||
raise IOError
|
||||
|
||||
def start_client(filename, cmd, env):
|
||||
if cmd is None:
|
||||
raise ValueError
|
||||
if os.environ.get('MOSQ_USE_VALGRIND') is not None:
|
||||
cmd = ['valgrind', '-q', '--log-file='+filename+'.vglog'] + cmd
|
||||
|
||||
return subprocess.Popen(cmd, env=env)
|
||||
|
||||
def expect_packet(sock, name, expected):
|
||||
if len(expected) > 0:
|
||||
rlen = len(expected)
|
||||
|
Loading…
Reference in New Issue
Block a user