aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Lalet <pierre@droids-corp.org>2018-01-21 21:30:06 +0100
committerGitHub <noreply@github.com>2018-01-21 21:30:06 +0100
commit9ff2533d6fd1e7bdaf60fae017fe7eeda7cf930c (patch)
tree06f1e725b2658f2cc997c1dcf5a817b9e58cdb08
parent3d54ccd97d55aeea5c3fa51bc3d704aeea55fc97 (diff)
parentd8e7031d5a05d32703860d8540f8d18f0d4f0498 (diff)
downloadscapy-9ff2533d6fd1e7bdaf60fae017fe7eeda7cf930c.tar.gz
Merge pull request #1077 from guedou/coverage_fix
Fix coverage reports
-rw-r--r--.coveragerc6
-rw-r--r--.travis/test.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/.coveragerc b/.coveragerc
index cec0a085..e279ef34 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,7 @@
[run]
omit =
+ # Travis specific path
+ /home/travis/virtualenv/python*
# Python specific path
/usr/local/lib/python2.7/*
# Scapy specific paths
@@ -8,6 +10,4 @@ omit =
scapy/tools/*
# Libraries
scapy/modules/six.py
- scapy/modules/winpcapy.py
- # Python 3: not tested yet
- scapy/compat.py
+ scapy/modules/winpcapy.py
diff --git a/.travis/test.sh b/.travis/test.sh
index 9e239cf2..46c1ef4e 100644
--- a/.travis/test.sh
+++ b/.travis/test.sh
@@ -71,7 +71,7 @@ if [ "$SCAPY_COVERAGE" = "yes" ]
then
echo '#!/bin/bash' > test/python
echo "[ \"\$*\" = \"--version\" ] && echo \"`python --version`\" && exit 0" >> test/python
- echo "`which coverage` run --concurrency=multiprocessing -a \$*" >> test/python
+ echo "`which coverage` run --rcfile=../.coveragerc --concurrency=multiprocessing -a \$*" >> test/python
chmod +x test/python
# Copy the fake Python interpreter to bypass /etc/sudoers rules on Ubuntu