diff --git a/py/conftest.py b/py/conftest.py index 9a01b49f6..95650f104 100644 --- a/py/conftest.py +++ b/py/conftest.py @@ -1,4 +1,4 @@ -pytest_plugins = 'pytest_doctest', 'pytest_pytester', 'pytest_restdoc' +pytest_plugins = 'pytest_doctest', 'pytest_pytester' # , 'pytest_restdoc' rsyncignore = ['c-extension/greenlet/build'] import py diff --git a/py/test/plugin/pytest_figleaf.py b/py/test/plugin/pytest_figleaf.py index 93fda3b9b..e588101fd 100644 --- a/py/test/plugin/pytest_figleaf.py +++ b/py/test/plugin/pytest_figleaf.py @@ -54,11 +54,11 @@ class FigleafPlugin: return coverage - def test_generic(plugintester): plugintester.apicheck(FigleafPlugin) def test_functional(testdir): + py.test.importorskip("figleaf") testdir.plugins.append('figleaf') testdir.makepyfile(""" def f(): diff --git a/py/test/plugin/pytest_resultdb.py b/py/test/plugin/pytest_resultdb.py index 9cbbaa479..a81baa2a8 100644 --- a/py/test/plugin/pytest_resultdb.py +++ b/py/test/plugin/pytest_resultdb.py @@ -308,6 +308,7 @@ def verify_archive_item_shape(item): class TestWithFunctionIntegration: def getarchive(self, testdir, arg): + py.test.importorskip("simplejson") resultdb = testdir.tmpdir.join("resultdb") args = ["--resultdb=%s" % resultdb, "--resultdb_format=sqlite"] + [arg] testdir.runpytest(*args) @@ -378,7 +379,7 @@ class TestWithFunctionIntegration: assert entry_lines[-1][0] == ' ' assert 'ValueError' in entry -def test_generic(plugintester, LineMatcher): +def test_generic(plugintester): plugintester.apicheck(ResultdbPlugin) testdir = plugintester.testdir() testdir.makepyfile("""