Merge pull request #2379 from gpotter2/coveragepy

Remove use of --append with coveragepy
secdev · Dec 18, 2019 · 4127625 · 4127625
2 parents ff43e45 + b38dc9a
commit 4127625
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -6,8 +6,8 @@ omit =
     test/*
     # Scapy external modules
     scapy/modules/six.py
-    scapy/modules/winpcapy.py
-    scapy/modules/ethertypes.py
+    scapy/libs/winpcapy.py
+    scapy/libs/ethertypes.py
     # .tox specific path
     .tox/*
     # OS specific paths

diff --git a/tox.ini b/tox.ini
@@ -25,7 +25,7 @@ deps = mock
        pydumbnet
        python-can
 commands =
-  sudo -E {envpython} -m coverage run -a -m scapy.tools.UTscapy -c ./test/configs/bsd.utsc -T test/bpf.uts -K manufdb -K tshark -K random_weird_py3 -K osx {posargs}
+  sudo -E {envpython} -m coverage run -m scapy.tools.UTscapy -c ./test/configs/bsd.utsc -T test/bpf.uts -K manufdb -K tshark -K random_weird_py3 -K osx {posargs}
 
 
 [testenv:linux_warnings]
@@ -61,7 +61,7 @@ commands =
   bash -c "cd /tmp/can-isotp; make; sudo make modules_install; sudo modprobe can_isotp || sudo insmod ./net/can/can-isotp.ko" 
   bash -c "rm -rf /tmp/can-utils /tmp/can-isotp"
   lsmod
-  sudo -E {envpython} -m coverage run -a -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 {posargs}
+  sudo -E {envpython} -m coverage run -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 {posargs}
 
 
 [testenv]
@@ -82,11 +82,11 @@ platform =
   windows: win32
 
 commands =
-  linux_non_root: coverage run -a -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 -K netaccess -K needs_root {posargs}
-  linux_root: sudo -E {envpython} -m coverage run -a -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 {posargs}
-  bsd_non_root: coverage run -a -m scapy.tools.UTscapy -c test/configs/bsd.utsc -K manufdb -K tshark -K random_weird_py3 -K netaccess -K needs_root {posargs}
-  bsd_root: sudo -E {envpython} -m coverage run -a -m scapy.tools.UTscapy -c test/configs/bsd.utsc -K manufdb -K tshark -K random_weird_py3 {posargs}
-  windows: {envpython} -m coverage run -a -m scapy.tools.UTscapy -c test/configs/windows.utsc -K random_weird_py3 {posargs}
+  linux_non_root: coverage run -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 -K netaccess -K needs_root {posargs}
+  linux_root: sudo -E {envpython} -m coverage run -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 {posargs}
+  bsd_non_root: coverage run -m scapy.tools.UTscapy -c test/configs/bsd.utsc -K manufdb -K tshark -K random_weird_py3 -K netaccess -K needs_root {posargs}
+  bsd_root: sudo -E {envpython} -m coverage run -m scapy.tools.UTscapy -c test/configs/bsd.utsc -K manufdb -K tshark -K random_weird_py3 {posargs}
+  windows: {envpython} -m coverage run -m scapy.tools.UTscapy -c test/configs/windows.utsc -K random_weird_py3 {posargs}
   coverage combine
 
 
@@ -102,7 +102,7 @@ deps = mock
        python-can
 
 commands =
-  coverage run -a -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 -K netaccess -K needs_root -K crypto_advanced {posargs}
+  coverage run -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 -K netaccess -K needs_root -K crypto_advanced {posargs}
   coverage combine