aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/functional2/README.md2
-rw-r--r--tests/functional2/meson.build12
2 files changed, 12 insertions, 2 deletions
diff --git a/tests/functional2/README.md b/tests/functional2/README.md
index 8d8aa244b..b0440fb3a 100644
--- a/tests/functional2/README.md
+++ b/tests/functional2/README.md
@@ -18,7 +18,7 @@ Its primary goal is to make tests more concise, more self-contained, easier to w
- [ ] Web server fixture: we don't test our network functionality because background processes are hard and this is simply goofy.
We could just test it.
- [ ] Nix daemon fixture.
-- [ ] Parallelism via pytest-xdist.
+- [x] Parallelism via pytest-xdist.
[pytest-expect-test]: https://pypi.org/project/pytest-expect-test/
[pytest-insta]: https://pypi.org/project/pytest-insta/
diff --git a/tests/functional2/meson.build b/tests/functional2/meson.build
index 590f11dd9..b18d7035d 100644
--- a/tests/functional2/meson.build
+++ b/tests/functional2/meson.build
@@ -1,3 +1,10 @@
+xdist_opts = [
+ # auto number of workers, max 12 jobs
+ '-n', 'auto', '--maxprocesses=12',
+ # group tests by module or class; ensures that any setup work occurs as little as possible
+ '--dist=loadscope',
+]
+
# surprisingly, this actually works even if PATH is set to something before
# meson gets hold of it. neat!
functional2_env = environment()
@@ -7,7 +14,10 @@ test(
'functional2',
python,
args : [
- '-m', 'pytest', meson.current_source_dir()
+ '-m', 'pytest',
+ '-v',
+ xdist_opts,
+ meson.current_source_dir()
],
env : functional2_env,
# FIXME: Although we can trivially use TAP here with pytest-tap, due to a meson bug, it is unusable.