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

Author: nicoddemus

testing/acceptance_test.py

@@ -727,7 +727,7 @@ def test(i):
             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 TestB:
                 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}
 

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 not config.option.dist:
+            config.option.dist = "load"
         config.option.tx = ['popen'] * config.option.numprocesses
     if config.option.distload:
         config.option.dist = "load"