From c6606d9d8f58b041e6993f567ce7d77ae059069e Mon Sep 17 00:00:00 2001 From: hpk Date: Wed, 8 Apr 2009 17:19:46 +0200 Subject: [PATCH] [svn r63846] fix bug --HG-- branch : trunk --- py/test/plugin/api.py | 2 +- py/test/plugin/pytest_runner.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/py/test/plugin/api.py b/py/test/plugin/api.py index 3ab83e6b1..a8d51a857 100644 --- a/py/test/plugin/api.py +++ b/py/test/plugin/api.py @@ -48,7 +48,7 @@ class PluginHooks: # runtest related hooks # ------------------------------------------------------------------------------ - def pytest_pyfunc_call(self, call, pyfuncitem, args, kwargs): + def pytest_pyfunc_call(self, pyfuncitem, args, kwargs): """ return True if we consumed/did the call to the python function item. """ def pytest_item_makereport(self, item, excinfo, when, outerr): diff --git a/py/test/plugin/pytest_runner.py b/py/test/plugin/pytest_runner.py index 4dd848f8c..5065885a8 100644 --- a/py/test/plugin/pytest_runner.py +++ b/py/test/plugin/pytest_runner.py @@ -1,5 +1,5 @@ import py -from outcome import Skipped +from py.__.test.outcome import Skipped class RunnerPlugin: def pytest_configure(self, config):