From 60c16fae697c25ada9873f25f8b4723fc1113110 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Thu, 11 Dec 2014 14:41:53 +0800 Subject: [PATCH] fix coverage --- .travis.yml | 2 +- tests/test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a885cc..90ffbaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,4 +34,4 @@ script: - python tests/test.py --with-coverage -s tests/ipv6.json -c tests/ipv6-client-side.json - python tests/test.py --with-coverage -b "-m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388" -a "-m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -l 1081" - python tests/test.py --with-coverage -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081" - - coverage report --include=shadowsocks/* + - coverage combine && coverage report --include=shadowsocks/* diff --git a/tests/test.py b/tests/test.py index 07e9957..5314d6e 100755 --- a/tests/test.py +++ b/tests/test.py @@ -44,7 +44,7 @@ parser.add_argument('--with-coverage', action='store_true', default=None) config = parser.parse_args() if config.with_coverage: - python = ['coverage', 'run', '-a'] + python = ['coverage', 'run', '-p', '-a'] client_args = python + ['shadowsocks/local.py', '-v'] server_args = python + ['shadowsocks/server.py', '-v']