vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

do not mix config of client and server for server-multi-passwd

Browse source
This commit is contained in:
clowwindy 2014-09-20 18:40:35 +08:00
parent 81223902d0
commit f0b0f6edff
4 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/test.py
View file

@ -10,15 +10,24 @@ from subprocess import Popen, PIPE
sys.path.insert(0, './')
if sys.argv[-3] == '-c':
client_config = sys.argv[-1]
server_config = sys.argv[-2]
elif sys.argv[-2] == '-c':
client_config = sys.argv[-1]
server_config = sys.argv[-1]
else:
raise Exception('usage: test.py -c server_conf [client_conf]')
if 'salsa20' in sys.argv[-1]:
from shadowsocks.crypto import salsa20_ctr
salsa20_ctr.test()
print 'encryption test passed'
p1 = Popen(['python', 'shadowsocks/server.py', '-c', sys.argv[-1]], stdin=PIPE,
stdout=PIPE, stderr=PIPE, close_fds=True)
p2 = Popen(['python', 'shadowsocks/local.py', '-c', sys.argv[-1]], stdin=PIPE,
stdout=PIPE, stderr=PIPE, close_fds=True)
p1 = Popen(['python', 'shadowsocks/server.py', '-c', server_config],
stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
p2 = Popen(['python', 'shadowsocks/local.py', '-c', client_config],
stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
p3 = None
try: