aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2019-01-04 19:47:53 +0100
committerAnders Broman <a.broman58@gmail.com>2019-01-05 06:47:25 +0000
commit0a25bfe647e4a46d0bbb5948041295dcccbad3ba (patch)
tree8c5669d567e19b052d85f15cc1176adf8e9b5b6a /.travis.yml
parent5dc1e77298263f13059542e41caa67e30696ca80 (diff)
test: enable parallelism by default for pytest
Consistent with tools like "ninja", enable parallelism by default. It can be disabled again with `pytest -n0`. This makes pytest-xdist a dependency when pytest is used as test runner. This does not affect the unittest-based test runnet (test/test.py). Change-Id: I4dc905f097c57a869aa39487b15361502b431616 Reviewed-on: https://code.wireshark.org/review/31371 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 959c9dc4e8..2ec6a6210d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,6 +72,6 @@ before_script:
script:
- ninja
- ninja test-programs
- - pytest -nauto -v
+ - pytest -v
after_script:
- if [ -f run/tshark ]; then run/tshark --version; fi