Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r89550:d0f316bdcdd6
Date: 2017-01-13 18:15 +0100
http://bitbucket.org/pypy/pypy/changeset/d0f316bdcdd6/
Log: Fix the deadlock in one test
diff --git a/lib-python/3/test/test_cmd_line_script.py
b/lib-python/3/test/test_cmd_line_script.py
--- a/lib-python/3/test/test_cmd_line_script.py
+++ b/lib-python/3/test/test_cmd_line_script.py
@@ -189,8 +189,8 @@
try:
# Drain stderr until prompt
while True:
- data = stderr.read(4)
- if data == b">>> ":
+ data = stderr.read(len(sys.ps1))
+ if data == sys.ps1.encode('utf-8'):
break
stderr.readline()
yield p
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -138,7 +138,7 @@
RegrTest('test_cmath.py', core=True),
RegrTest('test_cmd.py'),
RegrTest('test_cmd_line.py'),
- RegrTest('test_cmd_line_script.py', skip="XXX: deadlocks?"),
+ RegrTest('test_cmd_line_script.py'),
RegrTest('test_code.py', core=True),
RegrTest('test_code_module.py'),
RegrTest('test_codeccallbacks.py', core=True),
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
