fix issue34

This commit is contained in:
holger krekel
2011-03-16 17:59:14 +01:00
parent eb09e22b62
commit bd30e96ab0
7 changed files with 29 additions and 13 deletions

View File

@@ -1,2 +1,2 @@
#
__version__ = '1.6.dev2'
__version__ = '1.6.dev3'

View File

@@ -120,9 +120,7 @@ def init_slave_session(channel, args, option_dict):
#fullwidth, hasmarkup = channel.receive()
from _pytest.config import Config
config = Config()
config.option.__dict__.update(option_dict)
config._preparse(list(args))
config = Config.fromdictargs(option_dict, list(args))
config.args = args
from xdist.looponfail import SlaveFailSession
SlaveFailSession(config, channel).main()

View File

@@ -109,10 +109,8 @@ def getinfodict():
def remote_initconfig(option_dict, args):
from _pytest.config import Config
config = Config()
config.pluginmanager.unregister(name="terminal")
config._preparse(args, addopts=False)
config.option.__dict__.update(option_dict)
option_dict['plugins'].append("no:terminal")
config = Config.fromdictargs(option_dict, args)
config.option.looponfail = False
config.option.usepdb = False
config.option.dist = "no"