Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-11-03 00:13:42 +00:00
Code Releases Activity

Merge pull request #1786 from rogers0/PR/tests

Browse Source 
tests: Update default dns setting in tests
This commit is contained in:
Max Lv
2017-11-16 09:21:09 +08:00
committed by GitHub
parent f3c3080b94 fc11e6ae8a
commit 9dcba192c0
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test.py
+5 -4
View File
@@ -35,13 +35,14 @@ parser.add_argument('-a', '--client-args', type=str, default=None)
parser.add_argument('-b', '--server-args', type=str, default=None)
parser.add_argument('--should-fail', action='store_true', default=None)
parser.add_argument('--url', type=str, default=default_url)
parser.add_argument('--dns', type=str, default='10.19.185.252')
parser.add_argument('--dns', type=str, default='8.8.8.8')
parser.add_argument('--bin', type=str, default='')
config = parser.parse_args()
client_args = ['src/ss-local', '-v']
server_args = ['src/ss-server', '-v', '-u']
tunnel_args = ['src/ss-tunnel', '-v', '-u', '-l1082', '-L%s:53' % config.dns]
client_args = ['%s%s' % (config.bin, 'ss-local'), '-v']
server_args = ['%s%s' % (config.bin, 'ss-server'), '-v', '-u']
tunnel_args = ['%s%s' % (config.bin, 'ss-tunnel'), '-v', '-u', '-l1082', '-L%s:53' % config.dns]
if config.client_conf:
client_args.extend(['-c', config.client_conf])
tests/test.sh
+11 -8
View File
@@ -24,13 +24,16 @@ function run_test {
return 0
}
run_test python tests/test.py -c tests/aes.json
run_test python tests/test.py -c tests/aes-gcm.json
run_test python tests/test.py -c tests/aes-ctr.json
run_test python tests/test.py -c tests/rc4-md5.json
run_test python tests/test.py -c tests/salsa20.json
run_test python tests/test.py -c tests/chacha20.json
run_test python tests/test.py -c tests/chacha20-ietf.json
run_test python tests/test.py -c tests/chacha20-ietf-poly1305.json
[ -d src -a -x src/ss-local ] &&
BIN="--bin src/"
run_test python tests/test.py $BIN -c tests/aes.json
run_test python tests/test.py $BIN -c tests/aes-gcm.json
run_test python tests/test.py $BIN -c tests/aes-ctr.json
run_test python tests/test.py $BIN -c tests/rc4-md5.json
run_test python tests/test.py $BIN -c tests/salsa20.json
run_test python tests/test.py $BIN -c tests/chacha20.json
run_test python tests/test.py $BIN -c tests/chacha20-ietf.json
run_test python tests/test.py $BIN -c tests/chacha20-ietf-poly1305.json
exit $result