Skip to content

Commit

Permalink
Stop using coverage --append with multiprocessing
Browse files Browse the repository at this point in the history
  • Loading branch information
gpotter2 committed Dec 17, 2019
1 parent ff43e45 commit b38dc9a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand All @@ -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


Expand All @@ -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


Expand Down

0 comments on commit b38dc9a

Please sign in to comment.