Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r94593:104fba53d2eb
Date: 2018-05-14 22:48 +0100
http://bitbucket.org/pypy/pypy/changeset/104fba53d2eb/
Log: merge heads
diff --git a/pypy/interpreter/astcompiler/test/test_validate.py
b/pypy/interpreter/astcompiler/test/test_validate.py
--- a/pypy/interpreter/astcompiler/test/test_validate.py
+++ b/pypy/interpreter/astcompiler/test/test_validate.py
@@ -1,4 +1,5 @@
import os
+from pytest import raises
from pypy.interpreter.error import OperationError
from pypy.interpreter.baseobjspace import W_Root
from pypy.interpreter.astcompiler import ast
diff --git a/pypy/interpreter/test/test_app_main.py
b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_main.py
+++ b/pypy/interpreter/test/test_app_main.py
@@ -375,7 +375,7 @@
child.expect('>>>')
def test_atexit(self):
- skip("Python3 atexit is a builtin module")
+ py.test.skip("Python3 atexit is a builtin module")
child = self.spawn([])
child.expect('>>> ')
child.sendline('def f(): print("foobye")')
@@ -525,9 +525,9 @@
def test_options_i_m(self, monkeypatch):
if sys.platform == "win32":
- skip("close_fds is not supported on Windows platforms")
+ py.test.skip("close_fds is not supported on Windows platforms")
if not hasattr(runpy, '_run_module_as_main'):
- skip("requires CPython >= 2.6")
+ py.test.skip("requires CPython >= 2.6")
p = os.path.join(os.path.realpath(os.path.dirname(__file__)),
'mymodule.py')
p = os.path.abspath(p)
monkeypatch.chdir(os.path.dirname(app_main))
@@ -557,7 +557,7 @@
def test_options_u_i(self):
if sys.platform == "win32":
- skip("close_fds is not supported on Windows platforms")
+ py.test.skip("close_fds is not supported on Windows platforms")
import subprocess, select, os
pipe = subprocess.Popen([get_python3(), app_main, "-u", "-i"],
stdout=subprocess.PIPE,
@@ -614,7 +614,7 @@
del os.environ['PYTHONINSPECT_']
def test_stdout_flushes_before_stdin_blocks(self):
- skip("Python3 does not implement this behavior")
+ py.test.skip("Python3 does not implement this behavior")
# This doesn't really test app_main.py, but a behavior that
# can only be checked on top of py.py with pexpect.
path = getscript("""
@@ -632,7 +632,7 @@
def test_no_space_before_argument(self, monkeypatch):
if not hasattr(runpy, '_run_module_as_main'):
- skip("requires CPython >= 2.6")
+ py.test.skip("requires CPython >= 2.6")
child = self.spawn(['-cprint("hel" + "lo")'])
child.expect('hello')
@@ -753,7 +753,7 @@
def test_option_m(self, monkeypatch):
if not hasattr(runpy, '_run_module_as_main'):
- skip("requires CPython >= 2.6")
+ py.test.skip("requires CPython >= 2.6")
p = os.path.join(os.path.realpath(os.path.dirname(__file__)),
'mymodule.py')
p = os.path.abspath(p)
monkeypatch.chdir(os.path.dirname(app_main))
@@ -767,7 +767,7 @@
def test_option_m_package(self, monkeypatch):
if not hasattr(runpy, '_run_module_as_main'):
- skip("requires CPython >= 2.6")
+ py.test.skip("requires CPython >= 2.6")
p = os.path.join(os.path.realpath(os.path.dirname(__file__)),
'mypackage', '__main__.py')
p = os.path.abspath(p)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
