This commit is contained in:
bwilson
2018-11-13 10:45:40 -06:00
parent 311554324a
commit b94dcfe4cd

View File

@@ -249,7 +249,9 @@ class WorkerController(object):
basetemp = self.config._tmpdirhandler.getbasetemp() basetemp = self.config._tmpdirhandler.getbasetemp()
option_dict["basetemp"] = str(basetemp.join(name)) option_dict["basetemp"] = str(basetemp.join(name))
self.config.hook.pytest_configure_node(node=self) self.config.hook.pytest_configure_node(node=self)
target, _, target_kwargs = self.config.hook.pytest_xdist_getremotetarget().pack() target, _, target_kwargs = (
self.config.hook.pytest_xdist_getremotetarget().pack()
)
self.channel = self.gateway.remote_exec(target, **target_kwargs) self.channel = self.gateway.remote_exec(target, **target_kwargs)
self.channel.send((self.workerinput, args, option_dict)) self.channel.send((self.workerinput, args, option_dict))
if self.putevent: if self.putevent:
@@ -371,7 +373,9 @@ class RemoteTarget:
# this is based on execnet criteria # this is based on execnet criteria
assert not self._args, "Positional arguments are not yet supported" assert not self._args, "Positional arguments are not yet supported"
if isinstance(self._target, types.ModuleType): if isinstance(self._target, types.ModuleType):
assert not (self._args or self._kwargs), "Arguments are not used with module targets" assert not (
self._args or self._kwargs
), "Arguments are not used with module targets"
def pack(self): def pack(self):
return self._target, self._args, self._kwargs return self._target, self._args, self._kwargs