[svn r63543] some import-related skips, test suite passes again.

--HG--
branch : trunk

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

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():    

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("""