From: Victor Stinner Date: Wed, 29 Jun 2011 11:44:05 +0000 (+0200) Subject: Issue #12400: fix test_faulthandler if regrtest captures sys.stderr X-Git-Tag: v3.3.0a1~2016 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e32f3a401e7cc420a0db559c0ad4f0349e64d33;p=thirdparty%2FPython%2Fcpython.git Issue #12400: fix test_faulthandler if regrtest captures sys.stderr faulthandler.enable() requires that sys.stderr has a fileno() method. --- diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py index 0ddfc7f66fa2..291fac5126a4 100644 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -1,6 +1,7 @@ from contextlib import contextmanager import datetime import faulthandler +import os import re import signal import subprocess @@ -230,17 +231,30 @@ faulthandler._read_null() self.assertNotEqual(exitcode, 0) def test_is_enabled(self): - was_enabled = faulthandler.is_enabled() + null_stderr = None + orig_stderr = sys.stderr try: - faulthandler.enable() - self.assertTrue(faulthandler.is_enabled()) - faulthandler.disable() - self.assertFalse(faulthandler.is_enabled()) - finally: - if was_enabled: + # regrtest may replace sys.stderr by io.StringIO object, but + # faulthandler.enable() requires that sys.stderr has a fileno() + # method + null_stderr = open(os.devnull, 'w') + sys.stderr = null_stderr + + was_enabled = faulthandler.is_enabled() + try: faulthandler.enable() - else: + self.assertTrue(faulthandler.is_enabled()) faulthandler.disable() + self.assertFalse(faulthandler.is_enabled()) + finally: + if was_enabled: + faulthandler.enable() + else: + faulthandler.disable() + finally: + sys.stderr = orig_stderr + if null_stderr is not None: + null_stderr.close() def check_dump_traceback(self, filename): """