From a7f8c22ae572fb401237c7e83b42182bedbcc550 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 2 Aug 2017 21:12:26 -0300 Subject: [PATCH] Make "-nX" and "--dist=loadscope" work properly together --- testing/acceptance_test.py | 4 ++-- xdist/plugin.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index dbbddeb..10cec3c 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -727,7 +727,7 @@ class TestLoadScope: test_a=test_file, test_b=test_file, ) - result = testdir.runpytest('--tx=2*popen', '--dist=loadscope', '-v') + result = testdir.runpytest('-n2', '--dist=loadscope', '-v') assert get_workers_and_test_count_by_prefix('test_a.py::test', result.outlines) == {'gw0': 10} assert get_workers_and_test_count_by_prefix('test_b.py::test', result.outlines) == {'gw1': 10} @@ -744,7 +744,7 @@ class TestLoadScope: def test(self, i): pass """) - result = testdir.runpytest('--tx=2*popen', '--dist=loadscope', '-v') + result = testdir.runpytest('-n2', '--dist=loadscope', '-v') assert get_workers_and_test_count_by_prefix('test_a.py::TestA', result.outlines) == {'gw0': 10} assert get_workers_and_test_count_by_prefix('test_a.py::TestB', result.outlines) == {'gw1': 10} diff --git a/xdist/plugin.py b/xdist/plugin.py index 03a2cc1..47a9b54 100644 --- a/xdist/plugin.py +++ b/xdist/plugin.py @@ -98,7 +98,8 @@ def pytest_configure(config): @pytest.mark.tryfirst def pytest_cmdline_main(config): if config.option.numprocesses: - config.option.dist = "load" + if config.option.dist == 'no': + config.option.dist = "load" config.option.tx = ['popen'] * config.option.numprocesses if config.option.distload: config.option.dist = "load"