move tests and remove config.json
This commit is contained in:
parent
0df13b5715
commit
68b9a063c5
4 changed files with 9 additions and 17 deletions
14
.travis.yml
14
.travis.yml
|
@ -12,10 +12,10 @@ before_install:
|
|||
- pip install m2crypto salsa20
|
||||
- sudo tests/socksify/install.sh
|
||||
script:
|
||||
- python test.py -c tests/table.json
|
||||
- python test.py -c tests/aes.json
|
||||
- python test.py -c tests/salsa20.json
|
||||
- python test.py -c tests/server-multi-ports.json
|
||||
- python test.py -c tests/server-multi-passwd.json
|
||||
- python test.py -c tests/server-multi-passwd-table.json
|
||||
- python test.py -c tests/workers.json
|
||||
- python tests/test.py -c tests/table.json
|
||||
- python tests/test.py -c tests/aes.json
|
||||
- python tests/test.py -c tests/salsa20.json
|
||||
- python tests/test.py -c tests/server-multi-ports.json
|
||||
- python tests/test.py -c tests/server-multi-passwd.json
|
||||
- python tests/test.py -c tests/server-multi-passwd-table.json
|
||||
- python tests/test.py -c tests/workers.json
|
||||
|
|
10
config.json
10
config.json
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"server":"0.0.0.0",
|
||||
"server_port":8388,
|
||||
"local_port":1080,
|
||||
"password":"barfoo!",
|
||||
"timeout":300,
|
||||
"method":"aes-256-cfb",
|
||||
"local_address":"127.0.0.1",
|
||||
"fast_open":false
|
||||
}
|
|
@ -8,6 +8,8 @@ import select
|
|||
import time
|
||||
from subprocess import Popen, PIPE
|
||||
|
||||
sys.path.insert(0, '../')
|
||||
|
||||
if 'salsa20' in sys.argv[-1]:
|
||||
from shadowsocks import encrypt_salsa20
|
||||
encrypt_salsa20.test()
|
Loading…
Reference in a new issue