- make importorskip static at py.test.importorskip because it's

used for conditional plugin loading
- fix case where xfail is defined at module/class level
- fixes and improvements to docs, correct links to plugins
- use new skip facilities here and there

--HG--
branch : trunk
This commit is contained in:
holger krekel
2009-10-15 20:10:06 +02:00
parent 3ca770b420
commit d8b9b5f1c8
17 changed files with 148 additions and 148 deletions

View File

@@ -135,11 +135,7 @@ def test_assert_with_brokenrepr_arg():
class TestView:
def setup_class(cls):
try:
from _py.code._assertionold import View
except ImportError:
py.test.skip("requires the compile package")
cls.View = View
cls.View = py.test.importorskip("_py.code._assertionold").View
def test_class_dispatch(self):
### Use a custom class hierarchy with existing instances

View File

@@ -191,9 +191,8 @@ class TestSourceParsingAndCompiling:
assert len(source) == 9
assert source.getstatementrange(5) == (0, 9)
@py.test.mark.skipif("sys.version_info < (2,6)")
def test_compile_to_ast(self):
if sys.version_info < (2, 6):
py.test.skip("requires Python 2.6")
import ast
source = Source("x = 4")
mod = source.compile(flag=ast.PyCF_ONLY_AST)
@@ -257,7 +256,6 @@ def test_getstartingblock_multiline():
assert len(l) == 4
def test_getline_finally():
#py.test.skip("inner statements cannot be located yet.")
def c(): pass
excinfo = py.test.raises(TypeError, """
teardown = None