From 985c9163b79f8ac8fe36826f1d4095ea2458bea6 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 1 Nov 2010 09:22:49 +0100
Subject: [PATCH] unregister terminal plugin in subprocesses before it gets
 configured

---
 testing/test_remote.py | 1 +
 xdist/remote.py        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/testing/test_remote.py b/testing/test_remote.py
index 76329fe..16e0d5a 100644
--- a/testing/test_remote.py
+++ b/testing/test_remote.py
@@ -62,6 +62,7 @@ def test_remoteinitconfig(testdir):
     config1 = testdir.parseconfig()
     config2 = remote_initconfig(config1.option.__dict__, config1.args)
     assert config2.option.__dict__ == config1.option.__dict__
+    py.test.raises(KeyError, 'config2.pluginmanager.getplugin("terminal")')
 
 class TestReportSerialization:
     def test_itemreport_outcomes(self, testdir):
diff --git a/xdist/remote.py b/xdist/remote.py
index b867514..014c0e0 100644
--- a/xdist/remote.py
+++ b/xdist/remote.py
@@ -104,6 +104,7 @@ def getinfodict():
 def remote_initconfig(option_dict, args):
     from pytest.plugin.config import Config
     config = Config()
+    config.pluginmanager.unregister(name="terminal")
     config._preparse(args, addopts=False)
     config.option.__dict__.update(option_dict)
     config.option.looponfail = False