merge fix pytest issue382 - produce "pytest_runtest_logstart" event again

in master. Thanks Aron Curzon.
2013-11-19 12:08:55 +01:00
parent ca54911481
commit aad1aace52
4 changed files with 10 additions and 5 deletions
--- a/xdist/slavemanage.py
+++ b/xdist/slavemanage.py
@@ -278,8 +278,8 @@ class SlaveController(object):
                self._down = True
                self.slaveoutput = kwargs['slaveoutput']
                self.notify_inproc("slavefinished", node=self)
-            #elif eventname == "logstart":
-            #    self.notify_inproc(eventname, node=self, **kwargs)
+            elif eventname == "logstart":
+                self.notify_inproc(eventname, node=self, **kwargs)
            elif eventname in ("testreport", "collectreport", "teardownreport"):
                rep = unserialize_report(eventname, kwargs['data'])
                self.notify_inproc(eventname, node=self, rep=rep)