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

fix tests

Browse source
This commit is contained in:
clowwindy 2014-06-01 17:24:10 +08:00
parent 2672a6378e
commit 20ba04c4ce
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

@ -4,10 +4,11 @@ python:
- 2.7 - 2.7
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq build-essential libssl-dev swig libevent-dev python-gevent python-m2crypto python-numpy - sudo apt-get install -qq build-essential libssl-dev swig python-m2crypto python-numpy
- pip install m2crypto gevent salsa20 - pip install m2crypto salsa20
script: script:
- python test.py -c test/table.json - python test.py -c test/table.json
- python test.py -c test/aes.json - python test.py -c test/aes.json
- python test.py -c test/salsa20.json - python test.py -c test/salsa20.json
- python test.py -c test/server-multi-passwd.json - python test.py -c test/server-multi-passwd.json
- python test.py -c test/workers.json

2
shadowsocks/tcprelay.py
View file

@ -188,7 +188,7 @@ class TCPRelayHandler(object):
raise Exception('can not parse header') raise Exception('can not parse header')
addrtype, remote_addr, remote_port, header_length =\ addrtype, remote_addr, remote_port, header_length =\
header_result header_result
logging.info('connecting %s:%d' % (remote_addr, remote_port)) logging.debug('connecting %s:%d' % (remote_addr, remote_port))
if is_local: if is_local:
# forward address to remote # forward address to remote
self.write_all_to_sock('\x05\x00\x00\x01' + self.write_all_to_sock('\x05\x00\x00\x01' +

2
shadowsocks/utils.py
View file

@ -142,7 +142,7 @@ def get_config(is_local):
if config['verbose']: if config['verbose']:
level = logging.DEBUG level = logging.DEBUG
else: else:
level = logging.WARNING level = logging.INFO
logging.getLogger('').handlers = [] logging.getLogger('').handlers = []
logging.basicConfig(level=level, logging.basicConfig(level=level,
format='%(asctime)s %(levelname)-8s %(message)s', format='%(asctime)s %(levelname)-8s %(message)s',