Author: Armin Rigo <ar...@tunes.org>
Branch: py3k
Changeset: r87323:1953c9927f3b
Date: 2016-09-22 15:29 +0200
http://bitbucket.org/pypy/pypy/changeset/1953c9927f3b/
Log: In the py3k branch, use 'python3.3' to run -A tests, not 'python3'.
Some tests fail if the latter is a more recent version.
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -5,7 +5,8 @@
# some tests fail otherwise
sys.setrecursionlimit(2000)
-PYTHON3 = os.getenv('PYTHON3') or py.path.local.sysfind('python3')
+LOOK_FOR_PYTHON3 = 'python3.3'
+PYTHON3 = os.getenv('PYTHON3') or py.path.local.sysfind(LOOK_FOR_PYTHON3)
if PYTHON3 is not None:
PYTHON3 = str(PYTHON3)
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
@@ -7,7 +7,7 @@
from rpython.tool.udir import udir
from contextlib import contextmanager
from pypy import pypydir
-from pypy.conftest import PYTHON3
+from pypy.conftest import PYTHON3, LOOK_FOR_PYTHON3
from pypy.interpreter.test.conftest import banner
from lib_pypy._pypy_interact import irc_header
@@ -18,8 +18,8 @@
if PYTHON3:
return PYTHON3
import py.test
- py.test.fail("Test requires 'python3' (not found in PATH) or a PYTHON3 "
- "environment variable set")
+ py.test.fail("Test requires %r (not found in PATH) or a PYTHON3 "
+ "environment variable set" % (LOOK_FOR_PYTHON3,))
_counter = 0
def _get_next_path(ext='.py'):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
