diff options
| author | Guido van Rossum <guido@python.org> | 2007-11-22 00:30:02 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-11-22 00:30:02 (GMT) |
| commit | cd4d4527717abc09f13fc57ca9893a1f1591f9c0 (patch) | |
| tree | a674a01a99a02917d59b4f0c28a9828bb8cb326f /Lib/test | |
| parent | d05eb0043e597cf2d5c429d0e554fd39364e36b0 (diff) | |
| download | cpython-cd4d4527717abc09f13fc57ca9893a1f1591f9c0.zip cpython-cd4d4527717abc09f13fc57ca9893a1f1591f9c0.tar.gz cpython-cd4d4527717abc09f13fc57ca9893a1f1591f9c0.tar.bz2 | |
Merged revisions 59077-59104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59078 | brett.cannon | 2007-11-20 16:16:20 -0800 (Tue, 20 Nov 2007) | 2 lines
Remove a unneeded line that had typos.
........
r59081 | christian.heimes | 2007-11-20 16:46:21 -0800 (Tue, 20 Nov 2007) | 1 line
Fixed #1372: zlibmodule.c: int overflow in PyZlib_decompress
........
r59082 | brett.cannon | 2007-11-20 16:47:36 -0800 (Tue, 20 Nov 2007) | 6 lines
doctest assumed that a package's __loader__.get_data() method used universal
newlines; it doesn't. To rectify this the string returned replaces all
instances of os.linesep with '\n' to fake universal newline support.
Backport candidate.
........
r59084 | brett.cannon | 2007-11-20 16:58:03 -0800 (Tue, 20 Nov 2007) | 2 lines
Add a missing check before deleting a package's __loader__.
........
r59088 | christian.heimes | 2007-11-20 17:17:28 -0800 (Tue, 20 Nov 2007) | 2 lines
Added NEWS entry
Thanks for the reminder, Brett
........
r59089 | amaury.forgeotdarc | 2007-11-20 17:38:26 -0800 (Tue, 20 Nov 2007) | 2 lines
Add a NEWS entry for r59076.
........
r59091 | christian.heimes | 2007-11-20 18:50:06 -0800 (Tue, 20 Nov 2007) | 2 lines
Final fix for #1403
The Windows installer and some Linux distros are using compileall to compile all py files in the Lib/ directory. However no test exists to check if all py files can be compiled. I figured out that make testall is the easiest way to test compileall.
........
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_doctest.py | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index be2ffe2..3b89097 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -1912,6 +1912,24 @@ def test_DocFileSuite(): >>> suite.run(unittest.TestResult()) <unittest.TestResult run=3 errors=0 failures=2> + Support for using a package's __loader__.get_data() is also + provided. + + >>> import unittest, pkgutil, test + >>> if not hasattr(test, '__loader__'): + ... test.__loader__ = pkgutil.get_loader(test) + ... added_loader = True + >>> try: + ... suite = doctest.DocFileSuite('test_doctest.txt', + ... 'test_doctest2.txt', + ... 'test_doctest4.txt', + ... package='test') + ... suite.run(unittest.TestResult()) + ... finally: + ... if added_loader: + ... del test.__loader__ + <unittest.TestResult run=3 errors=0 failures=2> + '/' should be used as a path separator. It will be converted to a native separator at run time: @@ -1973,8 +1991,6 @@ def test_DocFileSuite(): And, you can provide setUp and tearDown functions: - You can supply setUp and teatDoen functions: - >>> def setUp(t): ... import test.test_doctest ... test.test_doctest.sillySetup = True |