tests: testdir.parseconfigure is enough

Author: blueyed

src/xdist/plugin.py

@@ -164,22 +164,6 @@ def pytest_addhooks(pluginmanager):
 
 @pytest.mark.trylast
 def pytest_configure(config):
-    _check_options(config)
-
-    if config.getoption("dist") != "no" and not config.getvalue("collectonly"):
-        from xdist.dsession import DSession
-
-        session = DSession(config)
-        config.pluginmanager.register(session, "dsession")
-        tr = config.pluginmanager.getplugin("terminalreporter")
-        if tr:
-            tr.showfspath = False
-    if config.getoption("boxed"):
-        config.option.forked = True
-
-
-def _check_options(config):
-    """Kept separate for tests."""
     usepdb = config.getoption("usepdb", False)  # a core option
     if isinstance(config.option.numprocesses, AutoInt):
         config.option.numprocesses = 0 if usepdb else int(config.option.numprocesses)
@@ -201,6 +185,17 @@ def _check_options(config):
                     "--pdb is incompatible with distributing tests; try using -n0 or -nauto."
                 )  # noqa: E501
 
+    if config.getoption("dist") != "no" and not config.getvalue("collectonly"):
+        from xdist.dsession import DSession
+
+        session = DSession(config)
+        config.pluginmanager.register(session, "dsession")
+        tr = config.pluginmanager.getplugin("terminalreporter")
+        if tr:
+            tr.showfspath = False
+    if config.getoption("boxed"):
+        config.option.forked = True
+
 
 # -------------------------------------------------------------------------
 # fixtures

testing/test_plugin.py

@@ -1,6 +1,5 @@
 import py
 import execnet
-from xdist.plugin import _check_options as check_options
 from xdist.workermanage import NodeManager
 
 
@@ -23,19 +22,15 @@ def test_pdb_can_be_used_before_configure(testdir):
 
 def test_dist_options(testdir):
     config = testdir.parseconfigure("-n 2")
-    check_options(config)
     assert config.option.dist == "load"
     assert config.option.tx == ["popen"] * 2
     config = testdir.parseconfigure("--numprocesses", "2")
-    check_options(config)
     assert config.option.dist == "load"
     assert config.option.tx == ["popen"] * 2
     config = testdir.parseconfigure("--numprocesses", "3", "--maxprocesses", "2")
-    check_options(config)
     assert config.option.dist == "load"
     assert config.option.tx == ["popen"] * 2
     config = testdir.parseconfigure("-d")
-    check_options(config)
     assert config.option.dist == "load"
 
 
@@ -58,7 +53,6 @@ def test_auto_detect_cpus(testdir, monkeypatch):
     assert config.getoption("numprocesses") == 99
 
     config = testdir.parseconfigure("-nauto", "--pdb")
-    check_options(config)
     assert config.getoption("usepdb")
     assert config.getoption("numprocesses") == 0
 
@@ -70,15 +64,12 @@ def test_auto_detect_cpus(testdir, monkeypatch):
 
 def test_boxed_with_collect_only(testdir):
     config = testdir.parseconfigure("-n1", "--boxed")
-    check_options(config)
     assert config.option.forked
 
     config = testdir.parseconfigure("-n1", "--collect-only")
-    check_options(config)
     assert not config.option.forked
 
     config = testdir.parseconfigure("-n1", "--boxed", "--collect-only")
-    check_options(config)
     assert config.option.forked