adapt to pytest changes, add looponfailingdirs ini-option

2010-11-06 09:58:00 +01:00
parent 985c9163b7
commit 9d55d3c831
9 changed files with 48 additions and 37 deletions
--- a/testing/test_slavemanage.py
+++ b/testing/test_slavemanage.py
@@ -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())