merge fix pytest issue382 - produce "pytest_runtest_logstart" event again

in master. Thanks Aron Curzon.
This commit is contained in:
holger krekel
2013-11-19 12:08:55 +01:00
parent ca54911481
commit aad1aace52
4 changed files with 10 additions and 5 deletions

View File

@@ -1,9 +1,11 @@
1.10 1.10 unreleased
------------------------- -------------------------
- ignore pyc files, dot files and directories for changes (editors write tmp/swap - ignore pyc files, dot files and directories for changes (editors write tmp/swap
files etc., which also affects mtime of directory) files etc., which also affects mtime of directory)
- fix pytest issue382 - produce "pytest_runtest_logstart" event again
in master. Thanks Aron Curzon.
1.9 1.9
------------------------- -------------------------

View File

@@ -156,6 +156,9 @@ class TestSlaveInteractor:
assert len(ids) == 1 assert len(ids) == 1
slave.sendcommand("runtests", ids=ids) slave.sendcommand("runtests", ids=ids)
slave.sendcommand("shutdown") 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") # setup
ev = slave.popevent("testreport") ev = slave.popevent("testreport")
assert ev.name == "testreport" assert ev.name == "testreport"

View File

@@ -75,8 +75,8 @@ class SlaveInteractor:
topdir=str(session.fspath), topdir=str(session.fspath),
ids=ids) ids=ids)
#def pytest_runtest_logstart(self, nodeid, location, fspath): def pytest_runtest_logstart(self, nodeid, location):
# self.sendevent("logstart", nodeid=nodeid, location=location) self.sendevent("logstart", nodeid=nodeid, location=location)
def pytest_runtest_logreport(self, report): def pytest_runtest_logreport(self, report):
data = serialize_report(report) data = serialize_report(report)

View File

@@ -278,8 +278,8 @@ class SlaveController(object):
self._down = True self._down = True
self.slaveoutput = kwargs['slaveoutput'] self.slaveoutput = kwargs['slaveoutput']
self.notify_inproc("slavefinished", node=self) self.notify_inproc("slavefinished", node=self)
#elif eventname == "logstart": elif eventname == "logstart":
# self.notify_inproc(eventname, node=self, **kwargs) self.notify_inproc(eventname, node=self, **kwargs)
elif eventname in ("testreport", "collectreport", "teardownreport"): elif eventname in ("testreport", "collectreport", "teardownreport"):
rep = unserialize_report(eventname, kwargs['data']) rep = unserialize_report(eventname, kwargs['data'])
self.notify_inproc(eventname, node=self, rep=rep) self.notify_inproc(eventname, node=self, rep=rep)