From: Victor Stinner Date: Sun, 10 Aug 2014 17:51:05 +0000 (+0200) Subject: (Merge 3.4) Close #22175: Improve test_faulthandler readability with dedent. X-Git-Tag: v3.5.0a1~1089 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68e0808ad5d9f55efc306bdbe0c5c755ed564f77;p=python (Merge 3.4) Close #22175: Improve test_faulthandler readability with dedent. Patch written by Xavier de Gaye. --- 68e0808ad5d9f55efc306bdbe0c5c755ed564f77 diff --cc Lib/test/test_faulthandler.py index f514f57819,41ccd1ef2c..a79afd8f55 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@@ -137,32 -135,26 +139,32 @@@ class FaultHandlerTests(unittest.TestCa 3, 'Floating point exception') - @unittest.skipIf(not hasattr(faulthandler, '_sigbus'), - "need faulthandler._sigbus()") + @unittest.skipIf(_testcapi is None, 'need _testcapi') + @unittest.skipUnless(hasattr(signal, 'SIGBUS'), 'need signal.SIGBUS') def test_sigbus(self): self.check_fatal_error(""" - import _testcapi - import faulthandler - import signal ++ import _testcapi + import faulthandler ++ import signal + - faulthandler.enable() - _testcapi.raise_signal(signal.SIGBUS) - """.strip(), + faulthandler.enable() - faulthandler._sigbus() ++ _testcapi.raise_signal(signal.SIGBUS) + """, - 3, + 6, 'Bus error') - @unittest.skipIf(not hasattr(faulthandler, '_sigill'), - "need faulthandler._sigill()") + @unittest.skipIf(_testcapi is None, 'need _testcapi') + @unittest.skipUnless(hasattr(signal, 'SIGILL'), 'need signal.SIGILL') def test_sigill(self): self.check_fatal_error(""" - import _testcapi - import faulthandler - import signal ++ import _testcapi + import faulthandler ++ import signal + - faulthandler.enable() - _testcapi.raise_signal(signal.SIGILL) - """.strip(), + faulthandler.enable() - faulthandler._sigill() ++ _testcapi.raise_signal(signal.SIGILL) + """, - 3, + 6, 'Illegal instruction') def test_fatal_error(self):