IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapt to pytest trunk changes - config moved to plugin

Browse Source
This commit is contained in:
holger krekel
2010-10-12 15:00:37 +02:00
parent d83af5fdcd
commit 7b73e081fe
5 changed files with 10 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xdist/remote.py
View File

@@ -101,7 +101,9 @@ def getinfodict():
cwd = os.getcwd(),
)
def remote_initconfig(config, option_dict, args):
def remote_initconfig(option_dict, args):
from pytest.plugin.config import Config
config = Config()
config._preparse(args)
config.option.__dict__.update(option_dict)
config.option.looponfail = False
@@ -116,7 +118,7 @@ def remote_initconfig(config, option_dict, args):
if __name__ == '__channelexec__':
slaveinput,args,option_dict = channel.receive()
import py
config = remote_initconfig(py.test.config, option_dict, args)
config = remote_initconfig(option_dict, args)
config.slaveinput = slaveinput
config.slaveoutput = {}
interactor = SlaveInteractor(config, channel)