adapt to pytest changes, add looponfailingdirs ini-option
This commit is contained in:
@@ -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")
|
||||
|
||||
@@ -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())
|
||||
|
||||
|
||||
Reference in New Issue
Block a user