jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

--HG--
branch : trunk
This commit is contained in:
hpk 2009-04-02 15:57:42 +02:00
parent 18a0dd8d09
commit 0ca3810203
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/conftest.py
View File

@ -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'] rsyncignore = ['c-extension/greenlet/build']
import py import py

2
py/test/plugin/pytest_figleaf.py
View File

@ -54,11 +54,11 @@ class FigleafPlugin:
return coverage return coverage
def test_generic(plugintester): def test_generic(plugintester):
plugintester.apicheck(FigleafPlugin) plugintester.apicheck(FigleafPlugin)
def test_functional(testdir): def test_functional(testdir):
py.test.importorskip("figleaf")
testdir.plugins.append('figleaf') testdir.plugins.append('figleaf')
testdir.makepyfile(""" testdir.makepyfile("""
def f(): def f():

3
py/test/plugin/pytest_resultdb.py
View File

@ -308,6 +308,7 @@ def verify_archive_item_shape(item):
class TestWithFunctionIntegration: class TestWithFunctionIntegration:
def getarchive(self, testdir, arg): def getarchive(self, testdir, arg):
py.test.importorskip("simplejson")
resultdb = testdir.tmpdir.join("resultdb") resultdb = testdir.tmpdir.join("resultdb")
args = ["--resultdb=%s" % resultdb, "--resultdb_format=sqlite"] + [arg] args = ["--resultdb=%s" % resultdb, "--resultdb_format=sqlite"] + [arg]
testdir.runpytest(*args) testdir.runpytest(*args)
@ -378,7 +379,7 @@ class TestWithFunctionIntegration:
assert entry_lines[-1][0] == ' ' assert entry_lines[-1][0] == ' '
assert 'ValueError' in entry assert 'ValueError' in entry
def test_generic(plugintester, LineMatcher): def test_generic(plugintester):
plugintester.apicheck(ResultdbPlugin) plugintester.apicheck(ResultdbPlugin)
testdir = plugintester.testdir() testdir = plugintester.testdir()
testdir.makepyfile(""" testdir.makepyfile("""