2010-03-27 10:25:41 -03:00
|
|
|
import gc
|
|
|
|
import io
|
|
|
|
import os
|
2010-04-12 14:16:38 -03:00
|
|
|
import sys
|
2010-03-27 10:25:41 -03:00
|
|
|
import signal
|
|
|
|
import weakref
|
|
|
|
|
|
|
|
import unittest
|
|
|
|
|
|
|
|
|
|
|
|
@unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill")
|
2010-04-12 14:16:38 -03:00
|
|
|
@unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows")
|
2010-04-21 21:53:47 -03:00
|
|
|
@unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 "
|
|
|
|
"if threads have been used")
|
2010-03-27 10:25:41 -03:00
|
|
|
class TestBreak(unittest.TestCase):
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
self._default_handler = signal.getsignal(signal.SIGINT)
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
signal.signal(signal.SIGINT, self._default_handler)
|
|
|
|
unittest.signals._results = weakref.WeakKeyDictionary()
|
|
|
|
unittest.signals._interrupt_handler = None
|
|
|
|
|
|
|
|
|
|
|
|
def testInstallHandler(self):
|
|
|
|
default_handler = signal.getsignal(signal.SIGINT)
|
|
|
|
unittest.installHandler()
|
|
|
|
self.assertNotEqual(signal.getsignal(signal.SIGINT), default_handler)
|
|
|
|
|
|
|
|
try:
|
|
|
|
pid = os.getpid()
|
|
|
|
os.kill(pid, signal.SIGINT)
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
self.fail("KeyboardInterrupt not handled")
|
|
|
|
|
|
|
|
self.assertTrue(unittest.signals._interrupt_handler.called)
|
|
|
|
|
|
|
|
def testRegisterResult(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
unittest.registerResult(result)
|
|
|
|
|
|
|
|
for ref in unittest.signals._results:
|
|
|
|
if ref is result:
|
|
|
|
break
|
|
|
|
elif ref is not result:
|
|
|
|
self.fail("odd object in result set")
|
|
|
|
else:
|
|
|
|
self.fail("result not found")
|
|
|
|
|
|
|
|
|
|
|
|
def testInterruptCaught(self):
|
|
|
|
default_handler = signal.getsignal(signal.SIGINT)
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
unittest.installHandler()
|
|
|
|
unittest.registerResult(result)
|
|
|
|
|
|
|
|
self.assertNotEqual(signal.getsignal(signal.SIGINT), default_handler)
|
|
|
|
|
|
|
|
def test(result):
|
|
|
|
pid = os.getpid()
|
|
|
|
os.kill(pid, signal.SIGINT)
|
|
|
|
result.breakCaught = True
|
|
|
|
self.assertTrue(result.shouldStop)
|
|
|
|
|
|
|
|
try:
|
|
|
|
test(result)
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
self.fail("KeyboardInterrupt not handled")
|
|
|
|
self.assertTrue(result.breakCaught)
|
|
|
|
|
|
|
|
|
|
|
|
def testSecondInterrupt(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
unittest.installHandler()
|
|
|
|
unittest.registerResult(result)
|
|
|
|
|
|
|
|
def test(result):
|
|
|
|
pid = os.getpid()
|
|
|
|
os.kill(pid, signal.SIGINT)
|
|
|
|
result.breakCaught = True
|
|
|
|
self.assertTrue(result.shouldStop)
|
|
|
|
os.kill(pid, signal.SIGINT)
|
|
|
|
self.fail("Second KeyboardInterrupt not raised")
|
|
|
|
|
|
|
|
try:
|
|
|
|
test(result)
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("Second KeyboardInterrupt not raised")
|
|
|
|
self.assertTrue(result.breakCaught)
|
|
|
|
|
|
|
|
|
|
|
|
def testTwoResults(self):
|
|
|
|
unittest.installHandler()
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
unittest.registerResult(result)
|
|
|
|
new_handler = signal.getsignal(signal.SIGINT)
|
|
|
|
|
|
|
|
result2 = unittest.TestResult()
|
|
|
|
unittest.registerResult(result2)
|
|
|
|
self.assertEqual(signal.getsignal(signal.SIGINT), new_handler)
|
|
|
|
|
|
|
|
result3 = unittest.TestResult()
|
|
|
|
|
|
|
|
def test(result):
|
|
|
|
pid = os.getpid()
|
|
|
|
os.kill(pid, signal.SIGINT)
|
|
|
|
|
|
|
|
try:
|
|
|
|
test(result)
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
self.fail("KeyboardInterrupt not handled")
|
|
|
|
|
|
|
|
self.assertTrue(result.shouldStop)
|
|
|
|
self.assertTrue(result2.shouldStop)
|
|
|
|
self.assertFalse(result3.shouldStop)
|
|
|
|
|
|
|
|
|
|
|
|
def testHandlerReplacedButCalled(self):
|
|
|
|
# If our handler has been replaced (is no longer installed) but is
|
|
|
|
# called by the *new* handler, then it isn't safe to delay the
|
|
|
|
# SIGINT and we should immediately delegate to the default handler
|
|
|
|
unittest.installHandler()
|
|
|
|
|
|
|
|
handler = signal.getsignal(signal.SIGINT)
|
|
|
|
def new_handler(frame, signum):
|
|
|
|
handler(frame, signum)
|
|
|
|
signal.signal(signal.SIGINT, new_handler)
|
|
|
|
|
|
|
|
try:
|
|
|
|
pid = os.getpid()
|
|
|
|
os.kill(pid, signal.SIGINT)
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("replaced but delegated handler doesn't raise interrupt")
|
|
|
|
|
|
|
|
def testRunner(self):
|
|
|
|
# Creating a TextTestRunner with the appropriate argument should
|
|
|
|
# register the TextTestResult it creates
|
|
|
|
runner = unittest.TextTestRunner(stream=io.StringIO())
|
|
|
|
|
|
|
|
result = runner.run(unittest.TestSuite())
|
|
|
|
self.assertIn(result, unittest.signals._results)
|
|
|
|
|
|
|
|
def testWeakReferences(self):
|
|
|
|
# Calling registerResult on a result should not keep it alive
|
|
|
|
result = unittest.TestResult()
|
|
|
|
unittest.registerResult(result)
|
|
|
|
|
|
|
|
ref = weakref.ref(result)
|
|
|
|
del result
|
|
|
|
|
|
|
|
# For non-reference counting implementations
|
|
|
|
gc.collect();gc.collect()
|
|
|
|
self.assertIsNone(ref())
|
|
|
|
|
|
|
|
|
|
|
|
def testRemoveResult(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
unittest.registerResult(result)
|
|
|
|
|
|
|
|
unittest.installHandler()
|
|
|
|
self.assertTrue(unittest.removeResult(result))
|
|
|
|
|
|
|
|
# Should this raise an error instead?
|
|
|
|
self.assertFalse(unittest.removeResult(unittest.TestResult()))
|
|
|
|
|
|
|
|
try:
|
|
|
|
pid = os.getpid()
|
|
|
|
os.kill(pid, signal.SIGINT)
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
pass
|
|
|
|
|
|
|
|
self.assertFalse(result.shouldStop)
|
|
|
|
|
|
|
|
def testMainInstallsHandler(self):
|
|
|
|
failfast = object()
|
|
|
|
test = object()
|
|
|
|
verbosity = object()
|
|
|
|
result = object()
|
|
|
|
default_handler = signal.getsignal(signal.SIGINT)
|
|
|
|
|
|
|
|
class FakeRunner(object):
|
|
|
|
initArgs = []
|
|
|
|
runArgs = []
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
|
|
self.initArgs.append((args, kwargs))
|
|
|
|
def run(self, test):
|
|
|
|
self.runArgs.append(test)
|
|
|
|
return result
|
|
|
|
|
|
|
|
class Program(unittest.TestProgram):
|
|
|
|
def __init__(self, catchbreak):
|
|
|
|
self.exit = False
|
|
|
|
self.verbosity = verbosity
|
|
|
|
self.failfast = failfast
|
|
|
|
self.catchbreak = catchbreak
|
|
|
|
self.testRunner = FakeRunner
|
|
|
|
self.test = test
|
|
|
|
self.result = None
|
|
|
|
|
|
|
|
p = Program(False)
|
|
|
|
p.runTests()
|
|
|
|
|
Merged revisions 79464,79471,79623,79626,79630,79632,79643,79648-79649,79679,79685,79711,79761,79774,79777,79792-79794,79877,79898-79900 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79464 | michael.foord | 2010-03-27 07:55:19 -0500 (Sat, 27 Mar 2010) | 1 line
A fix for running unittest tests on platforms without the audioop module (e.g. jython and IronPython)
........
r79471 | michael.foord | 2010-03-27 14:10:11 -0500 (Sat, 27 Mar 2010) | 4 lines
Addition of delta keyword argument to unittest.TestCase.assertAlmostEquals and assertNotAlmostEquals
This allows the comparison of objects by specifying a maximum difference; this includes the comparing of non-numeric objects that don't support rounding.
........
r79623 | michael.foord | 2010-04-02 16:42:47 -0500 (Fri, 02 Apr 2010) | 1 line
Addition of -b command line option to unittest for buffering stdout and stderr during test runs.
........
r79626 | michael.foord | 2010-04-02 17:08:29 -0500 (Fri, 02 Apr 2010) | 1 line
TestResult stores original sys.stdout and tests no longer use sys.__stdout__ (etc) in tests for unittest -b command line option
........
r79630 | michael.foord | 2010-04-02 17:30:56 -0500 (Fri, 02 Apr 2010) | 1 line
unittest tests no longer replace the sys.stdout put in place by regrtest
........
r79632 | michael.foord | 2010-04-02 17:55:59 -0500 (Fri, 02 Apr 2010) | 1 line
Issue #8038: Addition of unittest.TestCase.assertNotRegexpMatches
........
r79643 | michael.foord | 2010-04-02 20:15:21 -0500 (Fri, 02 Apr 2010) | 1 line
Support dotted module names for test discovery paths in unittest. Issue 8038.
........
r79648 | michael.foord | 2010-04-02 21:21:39 -0500 (Fri, 02 Apr 2010) | 1 line
Cross platform unittest.TestResult newline handling when buffering stdout / stderr.
........
r79649 | michael.foord | 2010-04-02 21:33:55 -0500 (Fri, 02 Apr 2010) | 1 line
Another attempt at a fix for unittest.test.test_result for windows line endings
........
r79679 | michael.foord | 2010-04-03 09:52:18 -0500 (Sat, 03 Apr 2010) | 1 line
Adding -b command line option to the unittest usage message.
........
r79685 | michael.foord | 2010-04-03 10:20:00 -0500 (Sat, 03 Apr 2010) | 1 line
Minor tweak to unittest command line usage message
........
r79711 | michael.foord | 2010-04-03 12:03:11 -0500 (Sat, 03 Apr 2010) | 1 line
Documenting new features in unittest
........
r79761 | michael.foord | 2010-04-04 17:41:54 -0500 (Sun, 04 Apr 2010) | 1 line
unittest documentation formatting changes
........
r79774 | michael.foord | 2010-04-04 18:28:44 -0500 (Sun, 04 Apr 2010) | 1 line
Adding documentation for new unittest.main() parameters
........
r79777 | michael.foord | 2010-04-04 19:39:50 -0500 (Sun, 04 Apr 2010) | 1 line
Document signal handling functions in unittest.rst
........
r79792 | michael.foord | 2010-04-05 05:26:26 -0500 (Mon, 05 Apr 2010) | 1 line
Documentation fixes for unittest
........
r79793 | michael.foord | 2010-04-05 05:28:27 -0500 (Mon, 05 Apr 2010) | 1 line
Furterh documentation fix for unittest.rst
........
r79794 | michael.foord | 2010-04-05 05:30:14 -0500 (Mon, 05 Apr 2010) | 1 line
Further documentation fix for unittest.rst
........
r79877 | michael.foord | 2010-04-06 18:18:16 -0500 (Tue, 06 Apr 2010) | 1 line
Fix module directory finding logic for dotted paths in unittest test discovery.
........
r79898 | michael.foord | 2010-04-07 18:04:22 -0500 (Wed, 07 Apr 2010) | 1 line
unittest.result.TestResult does not create its buffers until they're used. It uses StringIO not cStringIO. Issue 8333.
........
r79899 | michael.foord | 2010-04-07 19:04:24 -0500 (Wed, 07 Apr 2010) | 1 line
Switch regrtest to use StringIO instead of cStringIO for test_multiprocessing on Windows. Issue 8333.
........
r79900 | michael.foord | 2010-04-07 23:33:20 -0500 (Wed, 07 Apr 2010) | 1 line
Correction of unittest documentation typos and omissions
........
2010-04-11 17:43:16 -03:00
|
|
|
self.assertEqual(FakeRunner.initArgs, [((), {'buffer': None,
|
|
|
|
'verbosity': verbosity,
|
2010-11-30 20:56:10 -04:00
|
|
|
'failfast': failfast,
|
|
|
|
'warnings': None})])
|
2010-03-27 10:25:41 -03:00
|
|
|
self.assertEqual(FakeRunner.runArgs, [test])
|
|
|
|
self.assertEqual(p.result, result)
|
|
|
|
|
|
|
|
self.assertEqual(signal.getsignal(signal.SIGINT), default_handler)
|
|
|
|
|
|
|
|
FakeRunner.initArgs = []
|
|
|
|
FakeRunner.runArgs = []
|
|
|
|
p = Program(True)
|
|
|
|
p.runTests()
|
|
|
|
|
Merged revisions 79464,79471,79623,79626,79630,79632,79643,79648-79649,79679,79685,79711,79761,79774,79777,79792-79794,79877,79898-79900 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79464 | michael.foord | 2010-03-27 07:55:19 -0500 (Sat, 27 Mar 2010) | 1 line
A fix for running unittest tests on platforms without the audioop module (e.g. jython and IronPython)
........
r79471 | michael.foord | 2010-03-27 14:10:11 -0500 (Sat, 27 Mar 2010) | 4 lines
Addition of delta keyword argument to unittest.TestCase.assertAlmostEquals and assertNotAlmostEquals
This allows the comparison of objects by specifying a maximum difference; this includes the comparing of non-numeric objects that don't support rounding.
........
r79623 | michael.foord | 2010-04-02 16:42:47 -0500 (Fri, 02 Apr 2010) | 1 line
Addition of -b command line option to unittest for buffering stdout and stderr during test runs.
........
r79626 | michael.foord | 2010-04-02 17:08:29 -0500 (Fri, 02 Apr 2010) | 1 line
TestResult stores original sys.stdout and tests no longer use sys.__stdout__ (etc) in tests for unittest -b command line option
........
r79630 | michael.foord | 2010-04-02 17:30:56 -0500 (Fri, 02 Apr 2010) | 1 line
unittest tests no longer replace the sys.stdout put in place by regrtest
........
r79632 | michael.foord | 2010-04-02 17:55:59 -0500 (Fri, 02 Apr 2010) | 1 line
Issue #8038: Addition of unittest.TestCase.assertNotRegexpMatches
........
r79643 | michael.foord | 2010-04-02 20:15:21 -0500 (Fri, 02 Apr 2010) | 1 line
Support dotted module names for test discovery paths in unittest. Issue 8038.
........
r79648 | michael.foord | 2010-04-02 21:21:39 -0500 (Fri, 02 Apr 2010) | 1 line
Cross platform unittest.TestResult newline handling when buffering stdout / stderr.
........
r79649 | michael.foord | 2010-04-02 21:33:55 -0500 (Fri, 02 Apr 2010) | 1 line
Another attempt at a fix for unittest.test.test_result for windows line endings
........
r79679 | michael.foord | 2010-04-03 09:52:18 -0500 (Sat, 03 Apr 2010) | 1 line
Adding -b command line option to the unittest usage message.
........
r79685 | michael.foord | 2010-04-03 10:20:00 -0500 (Sat, 03 Apr 2010) | 1 line
Minor tweak to unittest command line usage message
........
r79711 | michael.foord | 2010-04-03 12:03:11 -0500 (Sat, 03 Apr 2010) | 1 line
Documenting new features in unittest
........
r79761 | michael.foord | 2010-04-04 17:41:54 -0500 (Sun, 04 Apr 2010) | 1 line
unittest documentation formatting changes
........
r79774 | michael.foord | 2010-04-04 18:28:44 -0500 (Sun, 04 Apr 2010) | 1 line
Adding documentation for new unittest.main() parameters
........
r79777 | michael.foord | 2010-04-04 19:39:50 -0500 (Sun, 04 Apr 2010) | 1 line
Document signal handling functions in unittest.rst
........
r79792 | michael.foord | 2010-04-05 05:26:26 -0500 (Mon, 05 Apr 2010) | 1 line
Documentation fixes for unittest
........
r79793 | michael.foord | 2010-04-05 05:28:27 -0500 (Mon, 05 Apr 2010) | 1 line
Furterh documentation fix for unittest.rst
........
r79794 | michael.foord | 2010-04-05 05:30:14 -0500 (Mon, 05 Apr 2010) | 1 line
Further documentation fix for unittest.rst
........
r79877 | michael.foord | 2010-04-06 18:18:16 -0500 (Tue, 06 Apr 2010) | 1 line
Fix module directory finding logic for dotted paths in unittest test discovery.
........
r79898 | michael.foord | 2010-04-07 18:04:22 -0500 (Wed, 07 Apr 2010) | 1 line
unittest.result.TestResult does not create its buffers until they're used. It uses StringIO not cStringIO. Issue 8333.
........
r79899 | michael.foord | 2010-04-07 19:04:24 -0500 (Wed, 07 Apr 2010) | 1 line
Switch regrtest to use StringIO instead of cStringIO for test_multiprocessing on Windows. Issue 8333.
........
r79900 | michael.foord | 2010-04-07 23:33:20 -0500 (Wed, 07 Apr 2010) | 1 line
Correction of unittest documentation typos and omissions
........
2010-04-11 17:43:16 -03:00
|
|
|
self.assertEqual(FakeRunner.initArgs, [((), {'buffer': None,
|
|
|
|
'verbosity': verbosity,
|
2010-11-30 20:56:10 -04:00
|
|
|
'failfast': failfast,
|
|
|
|
'warnings': None})])
|
2010-03-27 10:25:41 -03:00
|
|
|
self.assertEqual(FakeRunner.runArgs, [test])
|
|
|
|
self.assertEqual(p.result, result)
|
|
|
|
|
|
|
|
self.assertNotEqual(signal.getsignal(signal.SIGINT), default_handler)
|
2010-04-25 16:53:49 -03:00
|
|
|
|
|
|
|
def testRemoveHandler(self):
|
|
|
|
default_handler = signal.getsignal(signal.SIGINT)
|
|
|
|
unittest.installHandler()
|
|
|
|
unittest.removeHandler()
|
|
|
|
self.assertEqual(signal.getsignal(signal.SIGINT), default_handler)
|
|
|
|
|
|
|
|
# check that calling removeHandler multiple times has no ill-effect
|
|
|
|
unittest.removeHandler()
|
|
|
|
self.assertEqual(signal.getsignal(signal.SIGINT), default_handler)
|
|
|
|
|
|
|
|
def testRemoveHandlerAsDecorator(self):
|
|
|
|
default_handler = signal.getsignal(signal.SIGINT)
|
|
|
|
unittest.installHandler()
|
|
|
|
|
|
|
|
@unittest.removeHandler
|
|
|
|
def test():
|
|
|
|
self.assertEqual(signal.getsignal(signal.SIGINT), default_handler)
|
|
|
|
|
|
|
|
test()
|
|
|
|
self.assertNotEqual(signal.getsignal(signal.SIGINT), default_handler)
|