adapt to pytest changes, add looponfailingdirs ini-option

This commit is contained in:
holger krekel
2010-11-06 09:58:00 +01:00
parent 985c9163b7
commit 9d55d3c831
9 changed files with 48 additions and 37 deletions

View File

@@ -156,6 +156,8 @@ class TestSlaveInteractor:
assert not ev.kwargs
ev = slave.popevent()
assert ev.name == "collectreport"
ev = slave.popevent()
assert ev.name == "collectreport"
rep = unserialize_report(ev.name, ev.kwargs['data'])
assert rep.skipped
ev = slave.popevent("collectionfinish")
@@ -168,6 +170,8 @@ class TestSlaveInteractor:
assert not ev.kwargs
ev = slave.popevent()
assert ev.name == "collectreport"
ev = slave.popevent()
assert ev.name == "collectreport"
rep = unserialize_report(ev.name, ev.kwargs['data'])
assert rep.failed
ev = slave.popevent("collectionfinish")

View File

@@ -11,7 +11,7 @@ def pytest_funcarg__hookrecorder(request):
def pytest_funcarg__hook(request):
from xdist import newhooks
from pytest._core import HookRelay, PluginManager
from pytest.main import HookRelay, PluginManager
from pytest import hookspec
return HookRelay([hookspec, newhooks], PluginManager())