adapt to pytest trunk changes - config moved to plugin

xdist/looponfail.py

@@ -123,7 +123,8 @@ def init_slave_session(channel, args, option_dict):
     sys.path[:] = newpaths
 
     #fullwidth, hasmarkup = channel.receive()
-    config = py.test.config
+    from pytest.plugin.config import Config
+    config = Config()
     config.option.__dict__.update(option_dict)
     config._preparse(args)
     config.args = args

xdist/remote.py

@@ -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)