From 0a25bfe647e4a46d0bbb5948041295dcccbad3ba Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Fri, 4 Jan 2019 19:47:53 +0100 Subject: [PATCH] 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 --- .travis.yml | 2 +- appveyor.yml | 2 +- pytest.ini | 2 +- 3 files changed, 3 insertions(+), 3 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 diff --git a/appveyor.yml b/appveyor.yml index 6e200f290f..d329051441 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -58,7 +58,7 @@ before_test: - msbuild /m test-programs.vcxproj test_script: - - pytest -nauto + - pytest on_finish: - ps: | diff --git a/pytest.ini b/pytest.ini index b0b9daf3ca..bf5187aeb8 100644 --- a/pytest.ini +++ b/pytest.ini @@ -2,4 +2,4 @@ minversion = 3.0 testpaths = test python_files = suite_*.py group_*.py -addopts = -ra +addopts = -ra -nauto