[pypy-svn] pypy default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r43402:3e887780e9e3
Date: 2011-04-16 21:09 +0200
http://bitbucket.org/pypy/pypy/changeset/3e887780e9e3/

Log:	merge

diff --git a/pypy/module/pypyjit/test_pypy_c/test_pypy_c_new.py b/pypy/module/pypyjit/test_pypy_c/test_pypy_c_new.py
--- a/pypy/module/pypyjit/test_pypy_c/test_pypy_c_new.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_pypy_c_new.py
@@ -1498,7 +1498,7 @@
             try:
                 from _ffi import CDLL, types
             except ImportError:
-                sys.stdout.write('SKIP: cannot import _ffi')
+                sys.stderr.write('SKIP: cannot import _ffi\n')
                 return 0
 
             libm = CDLL(libm_name)

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