2010-03-27 09:34:21 -03:00
|
|
|
import io
|
|
|
|
import sys
|
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
|
|
|
import textwrap
|
2010-03-27 09:34:21 -03:00
|
|
|
|
|
|
|
from test import support
|
|
|
|
|
2010-05-02 18:00:22 -03:00
|
|
|
import traceback
|
2010-03-27 09:34:21 -03:00
|
|
|
import unittest
|
|
|
|
|
|
|
|
|
|
|
|
class Test_TestResult(unittest.TestCase):
|
|
|
|
# Note: there are not separate tests for TestResult.wasSuccessful(),
|
|
|
|
# TestResult.errors, TestResult.failures, TestResult.testsRun or
|
|
|
|
# TestResult.shouldStop because these only have meaning in terms of
|
|
|
|
# other TestResult methods.
|
|
|
|
#
|
|
|
|
# Accordingly, tests for the aforenamed attributes are incorporated
|
|
|
|
# in with the tests for the defining methods.
|
|
|
|
################################################################
|
|
|
|
|
|
|
|
def test_init(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
|
|
|
|
self.assertTrue(result.wasSuccessful())
|
|
|
|
self.assertEqual(len(result.errors), 0)
|
|
|
|
self.assertEqual(len(result.failures), 0)
|
|
|
|
self.assertEqual(result.testsRun, 0)
|
|
|
|
self.assertEqual(result.shouldStop, False)
|
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.assertIsNone(result._stdout_buffer)
|
|
|
|
self.assertIsNone(result._stderr_buffer)
|
2010-03-27 09:34:21 -03:00
|
|
|
|
|
|
|
# "This method can be called to signal that the set of tests being
|
|
|
|
# run should be aborted by setting the TestResult's shouldStop
|
|
|
|
# attribute to True."
|
|
|
|
def test_stop(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
|
|
|
|
result.stop()
|
|
|
|
|
|
|
|
self.assertEqual(result.shouldStop, True)
|
|
|
|
|
|
|
|
# "Called when the test case test is about to be run. The default
|
|
|
|
# implementation simply increments the instance's testsRun counter."
|
|
|
|
def test_startTest(self):
|
|
|
|
class Foo(unittest.TestCase):
|
|
|
|
def test_1(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
test = Foo('test_1')
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
|
|
|
|
result.startTest(test)
|
|
|
|
|
|
|
|
self.assertTrue(result.wasSuccessful())
|
|
|
|
self.assertEqual(len(result.errors), 0)
|
|
|
|
self.assertEqual(len(result.failures), 0)
|
|
|
|
self.assertEqual(result.testsRun, 1)
|
|
|
|
self.assertEqual(result.shouldStop, False)
|
|
|
|
|
|
|
|
result.stopTest(test)
|
|
|
|
|
|
|
|
# "Called after the test case test has been executed, regardless of
|
|
|
|
# the outcome. The default implementation does nothing."
|
|
|
|
def test_stopTest(self):
|
|
|
|
class Foo(unittest.TestCase):
|
|
|
|
def test_1(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
test = Foo('test_1')
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
|
|
|
|
result.startTest(test)
|
|
|
|
|
|
|
|
self.assertTrue(result.wasSuccessful())
|
|
|
|
self.assertEqual(len(result.errors), 0)
|
|
|
|
self.assertEqual(len(result.failures), 0)
|
|
|
|
self.assertEqual(result.testsRun, 1)
|
|
|
|
self.assertEqual(result.shouldStop, False)
|
|
|
|
|
|
|
|
result.stopTest(test)
|
|
|
|
|
|
|
|
# Same tests as above; make sure nothing has changed
|
|
|
|
self.assertTrue(result.wasSuccessful())
|
|
|
|
self.assertEqual(len(result.errors), 0)
|
|
|
|
self.assertEqual(len(result.failures), 0)
|
|
|
|
self.assertEqual(result.testsRun, 1)
|
|
|
|
self.assertEqual(result.shouldStop, False)
|
|
|
|
|
|
|
|
# "Called before and after tests are run. The default implementation does nothing."
|
|
|
|
def test_startTestRun_stopTestRun(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
result.startTestRun()
|
|
|
|
result.stopTestRun()
|
|
|
|
|
|
|
|
# "addSuccess(test)"
|
|
|
|
# ...
|
|
|
|
# "Called when the test case test succeeds"
|
|
|
|
# ...
|
|
|
|
# "wasSuccessful() - Returns True if all tests run so far have passed,
|
|
|
|
# otherwise returns False"
|
|
|
|
# ...
|
|
|
|
# "testsRun - The total number of tests run so far."
|
|
|
|
# ...
|
|
|
|
# "errors - A list containing 2-tuples of TestCase instances and
|
|
|
|
# formatted tracebacks. Each tuple represents a test which raised an
|
|
|
|
# unexpected exception. Contains formatted
|
|
|
|
# tracebacks instead of sys.exc_info() results."
|
|
|
|
# ...
|
|
|
|
# "failures - A list containing 2-tuples of TestCase instances and
|
|
|
|
# formatted tracebacks. Each tuple represents a test where a failure was
|
|
|
|
# explicitly signalled using the TestCase.fail*() or TestCase.assert*()
|
|
|
|
# methods. Contains formatted tracebacks instead
|
|
|
|
# of sys.exc_info() results."
|
|
|
|
def test_addSuccess(self):
|
|
|
|
class Foo(unittest.TestCase):
|
|
|
|
def test_1(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
test = Foo('test_1')
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
|
|
|
|
result.startTest(test)
|
|
|
|
result.addSuccess(test)
|
|
|
|
result.stopTest(test)
|
|
|
|
|
|
|
|
self.assertTrue(result.wasSuccessful())
|
|
|
|
self.assertEqual(len(result.errors), 0)
|
|
|
|
self.assertEqual(len(result.failures), 0)
|
|
|
|
self.assertEqual(result.testsRun, 1)
|
|
|
|
self.assertEqual(result.shouldStop, False)
|
|
|
|
|
|
|
|
# "addFailure(test, err)"
|
|
|
|
# ...
|
|
|
|
# "Called when the test case test signals a failure. err is a tuple of
|
|
|
|
# the form returned by sys.exc_info(): (type, value, traceback)"
|
|
|
|
# ...
|
|
|
|
# "wasSuccessful() - Returns True if all tests run so far have passed,
|
|
|
|
# otherwise returns False"
|
|
|
|
# ...
|
|
|
|
# "testsRun - The total number of tests run so far."
|
|
|
|
# ...
|
|
|
|
# "errors - A list containing 2-tuples of TestCase instances and
|
|
|
|
# formatted tracebacks. Each tuple represents a test which raised an
|
|
|
|
# unexpected exception. Contains formatted
|
|
|
|
# tracebacks instead of sys.exc_info() results."
|
|
|
|
# ...
|
|
|
|
# "failures - A list containing 2-tuples of TestCase instances and
|
|
|
|
# formatted tracebacks. Each tuple represents a test where a failure was
|
|
|
|
# explicitly signalled using the TestCase.fail*() or TestCase.assert*()
|
|
|
|
# methods. Contains formatted tracebacks instead
|
|
|
|
# of sys.exc_info() results."
|
|
|
|
def test_addFailure(self):
|
|
|
|
class Foo(unittest.TestCase):
|
|
|
|
def test_1(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
test = Foo('test_1')
|
|
|
|
try:
|
|
|
|
test.fail("foo")
|
|
|
|
except:
|
|
|
|
exc_info_tuple = sys.exc_info()
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
|
|
|
|
result.startTest(test)
|
|
|
|
result.addFailure(test, exc_info_tuple)
|
|
|
|
result.stopTest(test)
|
|
|
|
|
|
|
|
self.assertFalse(result.wasSuccessful())
|
|
|
|
self.assertEqual(len(result.errors), 0)
|
|
|
|
self.assertEqual(len(result.failures), 1)
|
|
|
|
self.assertEqual(result.testsRun, 1)
|
|
|
|
self.assertEqual(result.shouldStop, False)
|
|
|
|
|
|
|
|
test_case, formatted_exc = result.failures[0]
|
|
|
|
self.assertTrue(test_case is test)
|
|
|
|
self.assertIsInstance(formatted_exc, str)
|
|
|
|
|
|
|
|
# "addError(test, err)"
|
|
|
|
# ...
|
|
|
|
# "Called when the test case test raises an unexpected exception err
|
|
|
|
# is a tuple of the form returned by sys.exc_info():
|
|
|
|
# (type, value, traceback)"
|
|
|
|
# ...
|
|
|
|
# "wasSuccessful() - Returns True if all tests run so far have passed,
|
|
|
|
# otherwise returns False"
|
|
|
|
# ...
|
|
|
|
# "testsRun - The total number of tests run so far."
|
|
|
|
# ...
|
|
|
|
# "errors - A list containing 2-tuples of TestCase instances and
|
|
|
|
# formatted tracebacks. Each tuple represents a test which raised an
|
|
|
|
# unexpected exception. Contains formatted
|
|
|
|
# tracebacks instead of sys.exc_info() results."
|
|
|
|
# ...
|
|
|
|
# "failures - A list containing 2-tuples of TestCase instances and
|
|
|
|
# formatted tracebacks. Each tuple represents a test where a failure was
|
|
|
|
# explicitly signalled using the TestCase.fail*() or TestCase.assert*()
|
|
|
|
# methods. Contains formatted tracebacks instead
|
|
|
|
# of sys.exc_info() results."
|
|
|
|
def test_addError(self):
|
|
|
|
class Foo(unittest.TestCase):
|
|
|
|
def test_1(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
test = Foo('test_1')
|
|
|
|
try:
|
|
|
|
raise TypeError()
|
|
|
|
except:
|
|
|
|
exc_info_tuple = sys.exc_info()
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
|
|
|
|
result.startTest(test)
|
|
|
|
result.addError(test, exc_info_tuple)
|
|
|
|
result.stopTest(test)
|
|
|
|
|
|
|
|
self.assertFalse(result.wasSuccessful())
|
|
|
|
self.assertEqual(len(result.errors), 1)
|
|
|
|
self.assertEqual(len(result.failures), 0)
|
|
|
|
self.assertEqual(result.testsRun, 1)
|
|
|
|
self.assertEqual(result.shouldStop, False)
|
|
|
|
|
|
|
|
test_case, formatted_exc = result.errors[0]
|
|
|
|
self.assertTrue(test_case is test)
|
|
|
|
self.assertIsInstance(formatted_exc, str)
|
|
|
|
|
|
|
|
def testGetDescriptionWithoutDocstring(self):
|
|
|
|
result = unittest.TextTestResult(None, True, 1)
|
|
|
|
self.assertEqual(
|
|
|
|
result.getDescription(self),
|
|
|
|
'testGetDescriptionWithoutDocstring (' + __name__ +
|
|
|
|
'.Test_TestResult)')
|
|
|
|
|
|
|
|
@unittest.skipIf(sys.flags.optimize >= 2,
|
|
|
|
"Docstrings are omitted with -O2 and above")
|
|
|
|
def testGetDescriptionWithOneLineDocstring(self):
|
|
|
|
"""Tests getDescription() for a method with a docstring."""
|
|
|
|
result = unittest.TextTestResult(None, True, 1)
|
|
|
|
self.assertEqual(
|
|
|
|
result.getDescription(self),
|
|
|
|
('testGetDescriptionWithOneLineDocstring '
|
|
|
|
'(' + __name__ + '.Test_TestResult)\n'
|
|
|
|
'Tests getDescription() for a method with a docstring.'))
|
|
|
|
|
|
|
|
@unittest.skipIf(sys.flags.optimize >= 2,
|
|
|
|
"Docstrings are omitted with -O2 and above")
|
|
|
|
def testGetDescriptionWithMultiLineDocstring(self):
|
|
|
|
"""Tests getDescription() for a method with a longer docstring.
|
|
|
|
The second line of the docstring.
|
|
|
|
"""
|
|
|
|
result = unittest.TextTestResult(None, True, 1)
|
|
|
|
self.assertEqual(
|
|
|
|
result.getDescription(self),
|
|
|
|
('testGetDescriptionWithMultiLineDocstring '
|
|
|
|
'(' + __name__ + '.Test_TestResult)\n'
|
|
|
|
'Tests getDescription() for a method with a longer '
|
|
|
|
'docstring.'))
|
|
|
|
|
|
|
|
def testStackFrameTrimming(self):
|
|
|
|
class Frame(object):
|
|
|
|
class tb_frame(object):
|
|
|
|
f_globals = {}
|
|
|
|
result = unittest.TestResult()
|
|
|
|
self.assertFalse(result._is_relevant_tb_level(Frame))
|
|
|
|
|
|
|
|
Frame.tb_frame.f_globals['__unittest'] = True
|
|
|
|
self.assertTrue(result._is_relevant_tb_level(Frame))
|
|
|
|
|
|
|
|
def testFailFast(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
result._exc_info_to_string = lambda *_: ''
|
|
|
|
result.failfast = True
|
|
|
|
result.addError(None, None)
|
|
|
|
self.assertTrue(result.shouldStop)
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
result._exc_info_to_string = lambda *_: ''
|
|
|
|
result.failfast = True
|
|
|
|
result.addFailure(None, None)
|
|
|
|
self.assertTrue(result.shouldStop)
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
result._exc_info_to_string = lambda *_: ''
|
|
|
|
result.failfast = True
|
|
|
|
result.addUnexpectedSuccess(None)
|
|
|
|
self.assertTrue(result.shouldStop)
|
|
|
|
|
|
|
|
def testFailFastSetByRunner(self):
|
|
|
|
runner = unittest.TextTestRunner(stream=io.StringIO(), failfast=True)
|
|
|
|
def test(result):
|
|
|
|
self.assertTrue(result.failfast)
|
|
|
|
result = runner.run(test)
|
|
|
|
|
|
|
|
|
|
|
|
classDict = dict(unittest.TestResult.__dict__)
|
|
|
|
for m in ('addSkip', 'addExpectedFailure', 'addUnexpectedSuccess',
|
|
|
|
'__init__'):
|
|
|
|
del classDict[m]
|
|
|
|
|
|
|
|
def __init__(self, stream=None, descriptions=None, verbosity=None):
|
|
|
|
self.failures = []
|
|
|
|
self.errors = []
|
|
|
|
self.testsRun = 0
|
|
|
|
self.shouldStop = False
|
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.buffer = False
|
|
|
|
|
2010-03-27 09:34:21 -03:00
|
|
|
classDict['__init__'] = __init__
|
|
|
|
OldResult = type('OldResult', (object,), classDict)
|
|
|
|
|
|
|
|
class Test_OldTestResult(unittest.TestCase):
|
|
|
|
|
|
|
|
def assertOldResultWarning(self, test, failures):
|
Merged revisions 79297,79310,79382,79425-79427,79450 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79297 | florent.xicluna | 2010-03-22 18:18:18 +0100 (lun, 22 mar 2010) | 2 lines
#7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes.
........
r79310 | florent.xicluna | 2010-03-22 23:52:11 +0100 (lun, 22 mar 2010) | 2 lines
Issue #8205: Remove the "Modules" directory from sys.path when Python is running from the build directory (POSIX only).
........
r79382 | florent.xicluna | 2010-03-24 20:33:25 +0100 (mer, 24 mar 2010) | 2 lines
Skip tests which depend on multiprocessing.sharedctypes, if _ctypes is not available.
........
r79425 | florent.xicluna | 2010-03-25 21:32:07 +0100 (jeu, 25 mar 2010) | 2 lines
Syntax cleanup `== None` -> `is None`
........
r79426 | florent.xicluna | 2010-03-25 21:33:49 +0100 (jeu, 25 mar 2010) | 2 lines
#8207: Fix test_pep277 on OS X
........
r79427 | florent.xicluna | 2010-03-25 21:39:10 +0100 (jeu, 25 mar 2010) | 2 lines
Fix test_unittest and test_warnings when running "python -Werror -m test.regrtest"
........
r79450 | florent.xicluna | 2010-03-26 20:32:44 +0100 (ven, 26 mar 2010) | 2 lines
Ensure that the failed or unexpected tests are sorted before printing.
........
2010-03-27 21:25:02 -03:00
|
|
|
with support.check_warnings(("TestResult has no add.+ method,",
|
|
|
|
RuntimeWarning)):
|
2010-03-27 09:34:21 -03:00
|
|
|
result = OldResult()
|
|
|
|
test.run(result)
|
|
|
|
self.assertEqual(len(result.failures), failures)
|
|
|
|
|
|
|
|
def testOldTestResult(self):
|
|
|
|
class Test(unittest.TestCase):
|
|
|
|
def testSkip(self):
|
|
|
|
self.skipTest('foobar')
|
|
|
|
@unittest.expectedFailure
|
|
|
|
def testExpectedFail(self):
|
|
|
|
raise TypeError
|
|
|
|
@unittest.expectedFailure
|
|
|
|
def testUnexpectedSuccess(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
for test_name, should_pass in (('testSkip', True),
|
|
|
|
('testExpectedFail', True),
|
|
|
|
('testUnexpectedSuccess', False)):
|
|
|
|
test = Test(test_name)
|
|
|
|
self.assertOldResultWarning(test, int(not should_pass))
|
|
|
|
|
|
|
|
def testOldTestTesultSetup(self):
|
|
|
|
class Test(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
|
|
self.skipTest('no reason')
|
|
|
|
def testFoo(self):
|
|
|
|
pass
|
|
|
|
self.assertOldResultWarning(Test('testFoo'), 0)
|
|
|
|
|
|
|
|
def testOldTestResultClass(self):
|
|
|
|
@unittest.skip('no reason')
|
|
|
|
class Test(unittest.TestCase):
|
|
|
|
def testFoo(self):
|
|
|
|
pass
|
|
|
|
self.assertOldResultWarning(Test('testFoo'), 0)
|
|
|
|
|
|
|
|
def testOldResultWithRunner(self):
|
|
|
|
class Test(unittest.TestCase):
|
|
|
|
def testFoo(self):
|
|
|
|
pass
|
|
|
|
runner = unittest.TextTestRunner(resultclass=OldResult,
|
|
|
|
stream=io.StringIO())
|
|
|
|
# This will raise an exception if TextTestRunner can't handle old
|
|
|
|
# test result objects
|
|
|
|
runner.run(Test('testFoo'))
|
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
|
|
|
|
|
|
|
|
2010-05-02 18:00:22 -03:00
|
|
|
class MockTraceback(object):
|
|
|
|
@staticmethod
|
|
|
|
def format_exception(*_):
|
|
|
|
return ['A traceback']
|
|
|
|
|
|
|
|
def restore_traceback():
|
|
|
|
unittest.result.traceback = traceback
|
|
|
|
|
|
|
|
|
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
|
|
|
class TestOutputBuffering(unittest.TestCase):
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
self._real_out = sys.stdout
|
|
|
|
self._real_err = sys.stderr
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
sys.stdout = self._real_out
|
|
|
|
sys.stderr = self._real_err
|
|
|
|
|
|
|
|
def testBufferOutputOff(self):
|
|
|
|
real_out = self._real_out
|
|
|
|
real_err = self._real_err
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
self.assertFalse(result.buffer)
|
|
|
|
|
|
|
|
self.assertIs(real_out, sys.stdout)
|
|
|
|
self.assertIs(real_err, sys.stderr)
|
|
|
|
|
|
|
|
result.startTest(self)
|
|
|
|
|
|
|
|
self.assertIs(real_out, sys.stdout)
|
|
|
|
self.assertIs(real_err, sys.stderr)
|
|
|
|
|
|
|
|
def testBufferOutputStartTestAddSuccess(self):
|
|
|
|
real_out = self._real_out
|
|
|
|
real_err = self._real_err
|
|
|
|
|
|
|
|
result = unittest.TestResult()
|
|
|
|
self.assertFalse(result.buffer)
|
|
|
|
|
|
|
|
result.buffer = True
|
|
|
|
|
|
|
|
self.assertIs(real_out, sys.stdout)
|
|
|
|
self.assertIs(real_err, sys.stderr)
|
|
|
|
|
|
|
|
result.startTest(self)
|
|
|
|
|
|
|
|
self.assertIsNot(real_out, sys.stdout)
|
|
|
|
self.assertIsNot(real_err, sys.stderr)
|
|
|
|
self.assertIsInstance(sys.stdout, io.StringIO)
|
|
|
|
self.assertIsInstance(sys.stderr, io.StringIO)
|
|
|
|
self.assertIsNot(sys.stdout, sys.stderr)
|
|
|
|
|
|
|
|
out_stream = sys.stdout
|
|
|
|
err_stream = sys.stderr
|
|
|
|
|
|
|
|
result._original_stdout = io.StringIO()
|
|
|
|
result._original_stderr = io.StringIO()
|
|
|
|
|
|
|
|
print('foo')
|
|
|
|
print('bar', file=sys.stderr)
|
|
|
|
|
|
|
|
self.assertEqual(out_stream.getvalue(), 'foo\n')
|
|
|
|
self.assertEqual(err_stream.getvalue(), 'bar\n')
|
|
|
|
|
|
|
|
self.assertEqual(result._original_stdout.getvalue(), '')
|
|
|
|
self.assertEqual(result._original_stderr.getvalue(), '')
|
|
|
|
|
|
|
|
result.addSuccess(self)
|
|
|
|
result.stopTest(self)
|
|
|
|
|
|
|
|
self.assertIs(sys.stdout, result._original_stdout)
|
|
|
|
self.assertIs(sys.stderr, result._original_stderr)
|
|
|
|
|
|
|
|
self.assertEqual(result._original_stdout.getvalue(), '')
|
|
|
|
self.assertEqual(result._original_stderr.getvalue(), '')
|
|
|
|
|
|
|
|
self.assertEqual(out_stream.getvalue(), '')
|
|
|
|
self.assertEqual(err_stream.getvalue(), '')
|
|
|
|
|
|
|
|
|
|
|
|
def getStartedResult(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
result.buffer = True
|
|
|
|
result.startTest(self)
|
|
|
|
return result
|
|
|
|
|
|
|
|
def testBufferOutputAddErrorOrFailure(self):
|
2010-05-02 18:00:22 -03:00
|
|
|
unittest.result.traceback = MockTraceback
|
|
|
|
self.addCleanup(restore_traceback)
|
|
|
|
|
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
|
|
|
for message_attr, add_attr, include_error in [
|
|
|
|
('errors', 'addError', True),
|
|
|
|
('failures', 'addFailure', False),
|
|
|
|
('errors', 'addError', True),
|
|
|
|
('failures', 'addFailure', False)
|
|
|
|
]:
|
|
|
|
result = self.getStartedResult()
|
|
|
|
buffered_out = sys.stdout
|
|
|
|
buffered_err = sys.stderr
|
|
|
|
result._original_stdout = io.StringIO()
|
|
|
|
result._original_stderr = io.StringIO()
|
|
|
|
|
|
|
|
print('foo', file=sys.stdout)
|
|
|
|
if include_error:
|
|
|
|
print('bar', file=sys.stderr)
|
|
|
|
|
|
|
|
|
|
|
|
addFunction = getattr(result, add_attr)
|
|
|
|
addFunction(self, (None, None, None))
|
|
|
|
result.stopTest(self)
|
|
|
|
|
|
|
|
result_list = getattr(result, message_attr)
|
|
|
|
self.assertEqual(len(result_list), 1)
|
|
|
|
|
|
|
|
test, message = result_list[0]
|
|
|
|
expectedOutMessage = textwrap.dedent("""
|
|
|
|
Stdout:
|
|
|
|
foo
|
|
|
|
""")
|
|
|
|
expectedErrMessage = ''
|
|
|
|
if include_error:
|
|
|
|
expectedErrMessage = textwrap.dedent("""
|
|
|
|
Stderr:
|
|
|
|
bar
|
|
|
|
""")
|
2010-05-02 18:00:22 -03:00
|
|
|
|
|
|
|
expectedFullMessage = 'A traceback%s%s' % (expectedOutMessage, expectedErrMessage)
|
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.assertIs(test, self)
|
|
|
|
self.assertEqual(result._original_stdout.getvalue(), expectedOutMessage)
|
|
|
|
self.assertEqual(result._original_stderr.getvalue(), expectedErrMessage)
|
|
|
|
self.assertMultiLineEqual(message, expectedFullMessage)
|
|
|
|
|
2011-03-17 14:44:18 -03:00
|
|
|
def testBufferSetupClass(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
result.buffer = True
|
|
|
|
|
|
|
|
class Foo(unittest.TestCase):
|
|
|
|
@classmethod
|
|
|
|
def setUpClass(cls):
|
|
|
|
1/0
|
|
|
|
def test_foo(self):
|
|
|
|
pass
|
|
|
|
suite = unittest.TestSuite([Foo('test_foo')])
|
|
|
|
suite(result)
|
|
|
|
self.assertEqual(len(result.errors), 1)
|
|
|
|
|
|
|
|
def testBufferTearDownClass(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
result.buffer = True
|
|
|
|
|
|
|
|
class Foo(unittest.TestCase):
|
|
|
|
@classmethod
|
|
|
|
def tearDownClass(cls):
|
|
|
|
1/0
|
|
|
|
def test_foo(self):
|
|
|
|
pass
|
|
|
|
suite = unittest.TestSuite([Foo('test_foo')])
|
|
|
|
suite(result)
|
|
|
|
self.assertEqual(len(result.errors), 1)
|
|
|
|
|
|
|
|
def testBufferSetUpModule(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
result.buffer = True
|
|
|
|
|
|
|
|
class Foo(unittest.TestCase):
|
|
|
|
def test_foo(self):
|
|
|
|
pass
|
|
|
|
class Module(object):
|
|
|
|
@staticmethod
|
|
|
|
def setUpModule():
|
|
|
|
1/0
|
|
|
|
|
|
|
|
Foo.__module__ = 'Module'
|
|
|
|
sys.modules['Module'] = Module
|
|
|
|
self.addCleanup(sys.modules.pop, 'Module')
|
|
|
|
suite = unittest.TestSuite([Foo('test_foo')])
|
|
|
|
suite(result)
|
|
|
|
self.assertEqual(len(result.errors), 1)
|
|
|
|
|
|
|
|
def testBufferTearDownModule(self):
|
|
|
|
result = unittest.TestResult()
|
|
|
|
result.buffer = True
|
|
|
|
|
|
|
|
class Foo(unittest.TestCase):
|
|
|
|
def test_foo(self):
|
|
|
|
pass
|
|
|
|
class Module(object):
|
|
|
|
@staticmethod
|
|
|
|
def tearDownModule():
|
|
|
|
1/0
|
|
|
|
|
|
|
|
Foo.__module__ = 'Module'
|
|
|
|
sys.modules['Module'] = Module
|
|
|
|
self.addCleanup(sys.modules.pop, 'Module')
|
|
|
|
suite = unittest.TestSuite([Foo('test_foo')])
|
|
|
|
suite(result)
|
|
|
|
self.assertEqual(len(result.errors), 1)
|
|
|
|
|
|
|
|
|
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
|
|
|
if __name__ == '__main__':
|
|
|
|
unittest.main()
|