Added support for exchanging data between master and slave.

xdist/txnode.py

@@ -13,13 +13,17 @@ class TXNode(object):
     """
     ENDMARK = -1
 
-    def __init__(self, gateway, config, putevent):
+    def __init__(self, nodemanager, gateway, config, putevent):
+        self.nodemanager = nodemanager
         self.config = config 
         self.putevent = putevent 
         self.gateway = gateway
         self.channel = install_slave(gateway, config)
         self.channel.setcallback(self.callback, endmarker=self.ENDMARK)
         self._down = False
+        self.slavedatasent = False
+        self.slavedata = {}
+        self.slavereport = {}
 
     def __repr__(self):
         id = self.gateway.id
@@ -52,6 +56,7 @@ class TXNode(object):
                 self.notify("pytest_testnodeready", node=self)
             elif eventname == "slavefinished":
                 self._down = True
+                self.slavereport = kwargs['slavereport']
                 self.notify("pytest_testnodedown", error=None, node=self)
             elif eventname in ("pytest_runtest_logreport", 
                                "pytest__teardown_final_logerror"):
@@ -68,16 +73,24 @@ class TXNode(object):
             self.config.pluginmanager.notify_exception(excinfo)
 
     def send(self, item):
+        if not self.slavedatasent:
+            self.channel.send(self.slavedata)
+            self.slavedatasent = True
         assert item is not None
         self.channel.send(item)
 
     def sendlist(self, itemlist):
+        if not self.slavedatasent:
+            self.channel.send(self.slavedata)
+            self.slavedatasent = True
         self.channel.send(itemlist)
 
     def shutdown(self, kill=False):
         if kill:
             self.gateway.exit()
         else:
+            if not self.slavedatasent:
+                self.channel.send(None)
             self.channel.send(None)
 
 # setting up slave code 
@@ -106,6 +119,8 @@ def install_slave(gateway, config):
 class SlaveNode(object):
     def __init__(self, channel):
         self.channel = channel
+        self.slavedata = {}
+        self.slavereport = {}
 
     def __repr__(self):
         return "<%s channel=%s>" %(self.__class__.__name__, self.channel)
@@ -128,6 +143,7 @@ class SlaveNode(object):
         self.config.pluginmanager.register(self)
         self.runner = self.config.pluginmanager.getplugin("pytest_runner")
         self.sendevent("slaveready")
+        self.slavedata = channel.receive()
         try:
             self.config.hook.pytest_sessionstart(session=self)
             while 1:
@@ -149,7 +165,7 @@ class SlaveNode(object):
             self.sendevent("pytest_internalerror", excrepr=er)
             raise
         else:
-            self.sendevent("slavefinished")
+            self.sendevent("slavefinished", slavereport=self.slavereport)
 
     def run_single(self, item):
         call = self.runner.CallInfo(item._reraiseunpicklingproblem, when='setup')