From fe4b35fb0a4418125633f1a82e03503c619b6884 Mon Sep 17 00:00:00 2001
From: Falseen <hurxyill@163.com>
Date: Sun, 1 Nov 2015 19:36:20 +0800
Subject: [PATCH] remove coverage run -a
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

最新版coverage的-a和-p参数不能同时用
---
 tests/test.py            |  2 +-
 tests/test_command.sh    |  2 +-
 tests/test_daemon.sh     |  2 +-
 tests/test_large_file.sh |  2 +-
 tests/test_udp_src.sh    | 23 +++++++++++++++++++++++
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 tests/test_udp_src.sh

diff --git a/tests/test.py b/tests/test.py
index 29b57d4..4083401 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -44,7 +44,7 @@ parser.add_argument('--dns', type=str, default='8.8.8.8')
 config = parser.parse_args()
 
 if config.with_coverage:
-    python = ['coverage', 'run', '-p', '-a']
+    python = ['coverage', 'run', '-p']
 
 client_args = python + ['shadowsocks/local.py', '-v']
 server_args = python + ['shadowsocks/server.py', '-v']
diff --git a/tests/test_command.sh b/tests/test_command.sh
index be05704..696cb37 100755
--- a/tests/test_command.sh
+++ b/tests/test_command.sh
@@ -2,7 +2,7 @@
 
 . tests/assert.sh
 
-PYTHON="coverage run -a -p"
+PYTHON="coverage run -p"
 LOCAL="$PYTHON shadowsocks/local.py"
 SERVER="$PYTHON shadowsocks/server.py"
 
diff --git a/tests/test_daemon.sh b/tests/test_daemon.sh
index 40f35ef..7a192bd 100755
--- a/tests/test_daemon.sh
+++ b/tests/test_daemon.sh
@@ -18,7 +18,7 @@ function run_test {
 for module in local server
 do
 
-command="coverage run -p -a shadowsocks/$module.py"
+command="coverage run -p shadowsocks/$module.py"
 
 mkdir -p tmp
 
diff --git a/tests/test_large_file.sh b/tests/test_large_file.sh
index 33bcb59..7a61caf 100755
--- a/tests/test_large_file.sh
+++ b/tests/test_large_file.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PYTHON="coverage run -p -a"
+PYTHON="coverage run -p"
 URL=http://127.0.0.1/file
 
 mkdir -p tmp
diff --git a/tests/test_udp_src.sh b/tests/test_udp_src.sh
new file mode 100644
index 0000000..6a778ab
--- /dev/null
+++ b/tests/test_udp_src.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+PYTHON="coverage run -p"
+
+mkdir -p tmp
+
+$PYTHON shadowsocks/local.py -c tests/aes.json -v &
+LOCAL=$!
+
+$PYTHON shadowsocks/server.py -c tests/aes.json --forbidden-ip "" -v &
+SERVER=$!
+
+sleep 3
+
+python tests/test_udp_src.py
+r=$?
+
+kill -s SIGINT $LOCAL
+kill -s SIGINT $SERVER
+
+sleep 2
+
+exit $r