Make "-nX" and "--dist=loadscope" work properly together

2017-08-02 21:12:26 -03:00
parent 43f7dbeb02
commit a7f8c22ae5
2 changed files with 4 additions and 3 deletions
--- 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"