]> granicus.if.org Git - python/commitdiff
(Merge 3.4) Close #22175: Improve test_faulthandler readability with dedent.
authorVictor Stinner <victor.stinner@gmail.com>
Sun, 10 Aug 2014 17:51:05 +0000 (19:51 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Sun, 10 Aug 2014 17:51:05 +0000 (19:51 +0200)
Patch written by Xavier de Gaye.

1  2 
Lib/test/test_faulthandler.py

index f514f57819f540f8a7c01b998dd7a71fae8a331d,41ccd1ef2ce38cebcd9d6aebe980198d2ba91d40..a79afd8f5525aad161eb7ac6688ac866659fb94f
@@@ -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):