Use Config.invocation_params for consistent worker initialization
Decided to keep the old way still working for now. Fix #6 Fix #445
This commit is contained in:
@@ -15,6 +15,8 @@ import _pytest.hookspec
|
||||
import pytest
|
||||
from execnet.gateway_base import dumps, DumpError
|
||||
|
||||
from _pytest.config import _prepareconfig, Config
|
||||
|
||||
|
||||
class WorkerInteractor(object):
|
||||
def __init__(self, config, channel):
|
||||
@@ -211,18 +213,18 @@ def getinfodict():
|
||||
|
||||
|
||||
def remote_initconfig(option_dict, args):
|
||||
from _pytest.config import Config
|
||||
|
||||
option_dict["plugins"].append("no:terminal")
|
||||
config = Config.fromdictargs(option_dict, args)
|
||||
return Config.fromdictargs(option_dict, args)
|
||||
|
||||
|
||||
def setup_config(config, basetemp):
|
||||
config.option.looponfail = False
|
||||
config.option.usepdb = False
|
||||
config.option.dist = "no"
|
||||
config.option.distload = False
|
||||
config.option.numprocesses = None
|
||||
config.option.maxprocesses = None
|
||||
config.args = args
|
||||
return config
|
||||
config.option.basetemp = basetemp
|
||||
|
||||
|
||||
if __name__ == "__channelexec__":
|
||||
@@ -239,7 +241,13 @@ if __name__ == "__channelexec__":
|
||||
os.environ["PYTEST_XDIST_WORKER"] = workerinput["workerid"]
|
||||
os.environ["PYTEST_XDIST_WORKER_COUNT"] = str(workerinput["workercount"])
|
||||
|
||||
config = remote_initconfig(option_dict, args)
|
||||
if hasattr(Config, "InvocationParams"):
|
||||
config = _prepareconfig(args, None)
|
||||
else:
|
||||
config = remote_initconfig(option_dict, args)
|
||||
config.args = args
|
||||
|
||||
setup_config(config, option_dict.get("basetemp"))
|
||||
config._parser.prog = os.path.basename(workerinput["mainargv"][0])
|
||||
config.workerinput = workerinput
|
||||
config.workeroutput = {}
|
||||
|
||||
@@ -186,6 +186,8 @@ def make_reltoroot(roots, args):
|
||||
for arg in args:
|
||||
parts = arg.split(splitcode)
|
||||
fspath = py.path.local(parts[0])
|
||||
if not fspath.exists():
|
||||
continue
|
||||
for root in roots:
|
||||
x = fspath.relto(root)
|
||||
if x or fspath == root:
|
||||
@@ -236,10 +238,14 @@ class WorkerController(object):
|
||||
def setup(self):
|
||||
self.log("setting up worker session")
|
||||
spec = self.gateway.spec
|
||||
args = self.config.args
|
||||
if hasattr(self.config, "invocation_params"):
|
||||
args = [str(x) for x in self.config.invocation_params.args or ()]
|
||||
option_dict = {}
|
||||
else:
|
||||
args = self.config.args
|
||||
option_dict = vars(self.config.option)
|
||||
if not spec.popen or spec.chdir:
|
||||
args = make_reltoroot(self.nodemanager.roots, args)
|
||||
option_dict = vars(self.config.option)
|
||||
if spec.popen:
|
||||
name = "popen-%s" % self.gateway.id
|
||||
if hasattr(self.config, "_tmpdirhandler"):
|
||||
|
||||
Reference in New Issue
Block a user