[pypy-svn] pypy default: no need to use internal pytest imports here

hpk42 commits-noreply at bitbucket.org
Fri Apr 15 22:47:31 CEST 2011


Author: holger krekel <holger at merlinux.eu>
Branch: 
Changeset: r43391:7dca9ebbc108
Date: 2011-04-15 22:47 +0200
http://bitbucket.org/pypy/pypy/changeset/7dca9ebbc108/

Log:	no need to use internal pytest imports here

diff --git a/pypy/module/pypyjit/test_pypy_c/test_model.py b/pypy/module/pypyjit/test_pypy_c/test_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_model.py
@@ -271,12 +271,12 @@
         assert log.result == 42
 
     def test_skip(self):
-        import _pytest
+        import pytest
         def f():
             import sys
             print >> sys.stderr, 'SKIP: foobar'
         #
-        raises(_pytest.runner.Skipped, "self.run(f, [])")
+        raises(pytest.skip.Exception, "self.run(f, [])")
 
     def test_parse_jitlog(self):
         def f():


More information about the Pypy-commit mailing list