merge fix pytest issue382 - produce "pytest_runtest_logstart" event again
in master. Thanks Aron Curzon.
This commit is contained in:
@@ -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
|
||||
-------------------------
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user