From aad1aace521f06795c8a966d210ad2659b2f2e65 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 19 Nov 2013 12:08:55 +0100 Subject: [PATCH] merge fix pytest issue382 - produce "pytest_runtest_logstart" event again in master. Thanks Aron Curzon. --- CHANGELOG | 4 +++- testing/test_remote.py | 3 +++ xdist/remote.py | 4 ++-- xdist/slavemanage.py | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ca34174..8e5e0e6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,11 @@ -1.10 +1.10 unreleased ------------------------- - ignore pyc files, dot files and directories for changes (editors write tmp/swap files etc., which also affects mtime of directory) +- fix pytest issue382 - produce "pytest_runtest_logstart" event again + in master. Thanks Aron Curzon. 1.9 ------------------------- diff --git a/testing/test_remote.py b/testing/test_remote.py index 86b6f9a..d37f15a 100644 --- a/testing/test_remote.py +++ b/testing/test_remote.py @@ -156,6 +156,9 @@ class TestSlaveInteractor: assert len(ids) == 1 slave.sendcommand("runtests", ids=ids) slave.sendcommand("shutdown") + ev = slave.popevent("logstart") + assert ev.kwargs["nodeid"].endswith("test_func") + assert len(ev.kwargs["location"]) == 3 ev = slave.popevent("testreport") # setup ev = slave.popevent("testreport") assert ev.name == "testreport" diff --git a/xdist/remote.py b/xdist/remote.py index dbcc175..dc42aa0 100644 --- a/xdist/remote.py +++ b/xdist/remote.py @@ -75,8 +75,8 @@ class SlaveInteractor: topdir=str(session.fspath), ids=ids) - #def pytest_runtest_logstart(self, nodeid, location, fspath): - # self.sendevent("logstart", nodeid=nodeid, location=location) + def pytest_runtest_logstart(self, nodeid, location): + self.sendevent("logstart", nodeid=nodeid, location=location) def pytest_runtest_logreport(self, report): data = serialize_report(report) diff --git a/xdist/slavemanage.py b/xdist/slavemanage.py index 45ddff2..6a49108 100644 --- 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)