[Python-checkins] cpython (merge 3.3 -> default): #17493: merge with 3.3.

Wed Mar 20 17:18:13 CET 2013

http://hg.python.org/cpython/rev/2873f4971281
changeset: 82840:2873f4971281
parent: 82837:a6e6efa2f4dd
parent: 82839:8d22b6ed44e6
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Wed Mar 20 18:16:05 2013 +0200
summary:
 #17493: merge with 3.3.
files:
 Lib/test/test_sys.py | 20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -239,9 +239,6 @@
 def test_recursionlimit_fatalerror(self):
 # A fatal error occurs if a second recursion limit is hit when recovering
 # from a first one.
- if os.name == "nt":
- raise unittest.SkipTest(
- "under Windows, test would generate a spurious crash dialog")
 code = textwrap.dedent("""
 import sys
 
@@ -253,14 +250,15 @@
 
 sys.setrecursionlimit(%d)
 f()""")
- for i in (50, 1000):
- sub = subprocess.Popen([sys.executable, '-c', code % i],
- stderr=subprocess.PIPE)
- err = sub.communicate()[1]
- self.assertTrue(sub.returncode, sub.returncode)
- self.assertTrue(
- b"Fatal Python error: Cannot recover from stack overflow" in err,
- err)
+ with test.support.suppress_crash_popup():
+ for i in (50, 1000):
+ sub = subprocess.Popen([sys.executable, '-c', code % i],
+ stderr=subprocess.PIPE)
+ err = sub.communicate()[1]
+ self.assertTrue(sub.returncode, sub.returncode)
+ self.assertIn(
+ b"Fatal Python error: Cannot recover from stack overflow",
+ err)
 
 def test_getwindowsversion(self):
 # Raise SkipTest if sys doesn't have getwindowsversion attribute
-- 
Repository URL: http://hg.python.org/cpython
