Mercurial > cpython-lru_cache-weakref

annotate Lib/test/test_zipimport_support.py @ 79675:c0a2294de787 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #16199: Backport 2to3 typo fix from 3.2.
author Chris Jerdonek <chris.jerdonek@gmail.com>
date Thu, 11 Oct 2012 16:15:46 -0700
parents b48ef168d8c5
children d39f4a92d823
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
1 # This test module covers support in various parts of the standard library
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
2 # for working with modules located inside zipfiles
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
3 # The tests are centralised in this fashion to make it easy to drop them
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
4 # if a platform doesn't support zipimport
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
5 import test.test_support
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
6 import os
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
7 import os.path
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
8 import sys
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
9 import textwrap
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
10 import zipfile
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
11 import zipimport
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
12 import doctest
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
13 import inspect
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
14 import linecache
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
15 import pdb
63572
51102abdec50 Merged revisions 79165 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 50185
diff changeset
16 import warnings
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
17 from test.script_helper import (spawn_python, kill_python, run_python,
58817
70e115c34f97 Remove unused imports in test modules.
Georg Brandl <georg@python.org>
parents: 58460
diff changeset
18 temp_dir, make_script, make_zip_script)
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
19
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
20 verbose = test.test_support.verbose
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
21
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
22 # Library modules covered by this test set
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
23 # pdb (Issue 4201)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
24 # inspect (Issue 4223)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
25 # doctest (Issue 4197)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
26
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
27 # Other test modules with zipimport related tests
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
28 # test_zipimport (of course!)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
29 # test_cmd_line_script (covers the zipimport support in runpy)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
30
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
31 # Retrieve some helpers from other test cases
78961
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
32 from test import (test_doctest, sample_doctest, sample_doctest_no_doctests,
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
33 sample_doctest_no_docstrings)
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
34 from test.test_importhooks import ImportHooksBaseTestCase
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
35
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
36
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
37 def _run_object_doctest(obj, module):
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
38 # Direct doctest output (normally just errors) to real stdout; doctest
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
39 # output shouldn't be compared by regrtest.
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
40 save_stdout = sys.stdout
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
41 sys.stdout = test.test_support.get_original_stdout()
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
42 try:
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
43 finder = doctest.DocTestFinder(verbose=verbose, recurse=False)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
44 runner = doctest.DocTestRunner(verbose=verbose)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
45 # Use the object's fully qualified name if it has one
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
46 # Otherwise, use the module's name
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
47 try:
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
48 name = "%s.%s" % (obj.__module__, obj.__name__)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
49 except AttributeError:
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
50 name = module.__name__
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
51 for example in finder.find(obj, name, module):
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
52 runner.run(example)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
53 f, t = runner.failures, runner.tries
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
54 if f:
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
55 raise test.test_support.TestFailed("%d of %d doctests failed" % (f, t))
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
56 finally:
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
57 sys.stdout = save_stdout
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
58 if verbose:
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
59 print 'doctest (%s) ... %d tests with zero failures' % (module.__name__, t)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
60 return f, t
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
61
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
62
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
63
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
64 class ZipSupportTests(ImportHooksBaseTestCase):
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
65 # We use the ImportHooksBaseTestCase to restore
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
66 # the state of the import related information
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
67 # in the sys module after each test
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
68 # We also clear the linecache and zipimport cache
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
69 # just to avoid any bogus errors due to name reuse in the tests
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
70 def setUp(self):
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
71 linecache.clearcache()
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
72 zipimport._zip_directory_cache.clear()
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
73 ImportHooksBaseTestCase.setUp(self)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
74
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
75
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
76 def test_inspect_getsource_issue4223(self):
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
77 test_src = "def foo(): pass\n"
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
78 with temp_dir() as d:
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
79 init_name = make_script(d, '__init__', test_src)
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
80 name_in_zip = os.path.join('zip_pkg',
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
81 os.path.basename(init_name))
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
82 zip_name, run_name = make_zip_script(d, 'test_zip',
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
83 init_name, name_in_zip)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
84 os.remove(init_name)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
85 sys.path.insert(0, zip_name)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
86 import zip_pkg
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
87 self.assertEqual(inspect.getsource(zip_pkg.foo), test_src)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
88
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
89 def test_doctest_issue4197(self):
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
90 # To avoid having to keep two copies of the doctest module's
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
91 # unit tests in sync, this test works by taking the source of
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
92 # test_doctest itself, rewriting it a bit to cope with a new
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
93 # location, and then throwing it in a zip file to make sure
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
94 # everything still works correctly
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
95 test_src = inspect.getsource(test_doctest)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
96 test_src = test_src.replace(
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
97 "from test import test_doctest",
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
98 "import test_zipped_doctest as test_doctest")
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
99 test_src = test_src.replace("test.test_doctest",
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
100 "test_zipped_doctest")
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
101 test_src = test_src.replace("test.sample_doctest",
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
102 "sample_zipped_doctest")
78961
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
103 # The sample doctest files rewritten to include in the zipped version.
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
104 sample_sources = {}
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
105 for mod in [sample_doctest, sample_doctest_no_doctests,
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
106 sample_doctest_no_docstrings]:
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
107 src = inspect.getsource(mod)
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
108 src = src.replace("test.test_doctest", "test_zipped_doctest")
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
109 # Rewrite the module name so that, for example,
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
110 # "test.sample_doctest" becomes "sample_zipped_doctest".
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
111 mod_name = mod.__name__.split(".")[-1]
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
112 mod_name = mod_name.replace("sample_", "sample_zipped_")
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
113 sample_sources[mod_name] = src
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
114
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
115 with temp_dir() as d:
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
116 script_name = make_script(d, 'test_zipped_doctest',
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
117 test_src)
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
118 zip_name, run_name = make_zip_script(d, 'test_zip',
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
119 script_name)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
120 z = zipfile.ZipFile(zip_name, 'a')
78961
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
121 for mod_name, src in sample_sources.items():
b48ef168d8c5 #14649: clarify DocTestSuite error when there are no docstrings.
R David Murray <rdmurray@bitdance.com>
parents: 68256
diff changeset
122 z.writestr(mod_name + ".py", src)
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
123 z.close()
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
124 if verbose:
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
125 zip_file = zipfile.ZipFile(zip_name, 'r')
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
126 print 'Contents of %r:' % zip_name
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
127 zip_file.printdir()
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
128 zip_file.close()
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
129 os.remove(script_name)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
130 sys.path.insert(0, zip_name)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
131 import test_zipped_doctest
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
132 # Some of the doc tests depend on the colocated text files
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
133 # which aren't available to the zipped version (the doctest
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
134 # module currently requires real filenames for non-embedded
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
135 # tests). So we're forced to be selective about which tests
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
136 # to run.
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
137 # doctest could really use some APIs which take a text
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
138 # string or a file object instead of a filename...
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
139 known_good_tests = [
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
140 test_zipped_doctest.SampleClass,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
141 test_zipped_doctest.SampleClass.NestedClass,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
142 test_zipped_doctest.SampleClass.NestedClass.__init__,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
143 test_zipped_doctest.SampleClass.__init__,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
144 test_zipped_doctest.SampleClass.a_classmethod,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
145 test_zipped_doctest.SampleClass.a_property,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
146 test_zipped_doctest.SampleClass.a_staticmethod,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
147 test_zipped_doctest.SampleClass.double,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
148 test_zipped_doctest.SampleClass.get,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
149 test_zipped_doctest.SampleNewStyleClass,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
150 test_zipped_doctest.SampleNewStyleClass.__init__,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
151 test_zipped_doctest.SampleNewStyleClass.double,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
152 test_zipped_doctest.SampleNewStyleClass.get,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
153 test_zipped_doctest.old_test1,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
154 test_zipped_doctest.old_test2,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
155 test_zipped_doctest.old_test3,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
156 test_zipped_doctest.old_test4,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
157 test_zipped_doctest.sample_func,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
158 test_zipped_doctest.test_DocTest,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
159 test_zipped_doctest.test_DocTestParser,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
160 test_zipped_doctest.test_DocTestRunner.basics,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
161 test_zipped_doctest.test_DocTestRunner.exceptions,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
162 test_zipped_doctest.test_DocTestRunner.option_directives,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
163 test_zipped_doctest.test_DocTestRunner.optionflags,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
164 test_zipped_doctest.test_DocTestRunner.verbose_flag,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
165 test_zipped_doctest.test_Example,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
166 test_zipped_doctest.test_debug,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
167 test_zipped_doctest.test_pdb_set_trace,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
168 test_zipped_doctest.test_pdb_set_trace_nested,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
169 test_zipped_doctest.test_testsource,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
170 test_zipped_doctest.test_trailing_space_in_test,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
171 test_zipped_doctest.test_DocTestSuite,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
172 test_zipped_doctest.test_DocTestFinder,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
173 ]
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
174 # These remaining tests are the ones which need access
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
175 # to the data files, so we don't run them
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
176 fail_due_to_missing_data_files = [
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
177 test_zipped_doctest.test_DocFileSuite,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
178 test_zipped_doctest.test_testfile,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
179 test_zipped_doctest.test_unittest_reportflags,
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
180 ]
63572
51102abdec50 Merged revisions 79165 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 50185
diff changeset
181 # Needed for test_DocTestParser and test_debug
63634
762d89faceaa Merged revisions 79539 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 63572
diff changeset
182 deprecations = [
762d89faceaa Merged revisions 79539 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 63572
diff changeset
183 # Ignore all warnings about the use of class Tester in this module.
762d89faceaa Merged revisions 79539 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 63572
diff changeset
184 ("class Tester is deprecated", DeprecationWarning)]
762d89faceaa Merged revisions 79539 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 63572
diff changeset
185 if sys.py3kwarning:
762d89faceaa Merged revisions 79539 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 63572
diff changeset
186 deprecations += [
63572
51102abdec50 Merged revisions 79165 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 50185
diff changeset
187 ("backquote not supported", SyntaxWarning),
63634
762d89faceaa Merged revisions 79539 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 63572
diff changeset
188 ("execfile.. not supported", DeprecationWarning)]
762d89faceaa Merged revisions 79539 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 63572
diff changeset
189 with test.test_support.check_warnings(*deprecations):
63572
51102abdec50 Merged revisions 79165 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 50185
diff changeset
190 for obj in known_good_tests:
51102abdec50 Merged revisions 79165 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents: 50185
diff changeset
191 _run_object_doctest(obj, test_zipped_doctest)
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
192
50185
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
193 def test_doctest_main_issue4197(self):
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
194 test_src = textwrap.dedent("""\
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
195 class Test:
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
196 ">>> 'line 2'"
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
197 pass
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
198
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
199 import doctest
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
200 doctest.testmod()
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
201 """)
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
202 pattern = 'File "%s", line 2, in %s'
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
203 with temp_dir() as d:
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
204 script_name = make_script(d, 'script', test_src)
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
205 exit_code, data = run_python(script_name)
50185
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
206 expected = pattern % (script_name, "__main__.Test")
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
207 if verbose:
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
208 print "Expected line", expected
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
209 print "Got stdout:"
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
210 print data
58460
17891566a478 use assert[Not]In where appropriate
Ezio Melotti <ezio.melotti@gmail.com>
parents: 58198
diff changeset
211 self.assertIn(expected, data)
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
212 zip_name, run_name = make_zip_script(d, "test_zip",
50185
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
213 script_name, '__main__.py')
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
214 exit_code, data = run_python(zip_name)
50185
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
215 expected = pattern % (run_name, "__main__.Test")
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
216 if verbose:
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
217 print "Expected line", expected
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
218 print "Got stdout:"
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
219 print data
58460
17891566a478 use assert[Not]In where appropriate
Ezio Melotti <ezio.melotti@gmail.com>
parents: 58198
diff changeset
220 self.assertIn(expected, data)
50185
edd72437cec3 Merged revisions 67790 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents: 50162
diff changeset
221
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
222 def test_pdb_issue4201(self):
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
223 test_src = textwrap.dedent("""\
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
224 def f():
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
225 pass
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
226
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
227 import pdb
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
228 pdb.runcall(f)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
229 """)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
230 with temp_dir() as d:
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
231 script_name = make_script(d, 'script', test_src)
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
232 p = spawn_python(script_name)
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
233 p.stdin.write('l\n')
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
234 data = kill_python(p)
58460
17891566a478 use assert[Not]In where appropriate
Ezio Melotti <ezio.melotti@gmail.com>
parents: 58198
diff changeset
235 self.assertIn(script_name, data)
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
236 zip_name, run_name = make_zip_script(d, "test_zip",
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
237 script_name, '__main__.py')
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
238 p = spawn_python(zip_name)
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
239 p.stdin.write('l\n')
57255
40881db31689 Issue #6816: expose the zipfile and directory execution mechanism to Python code via the runpy module. Also consolidated some script execution functionality in the test harness into a helper module and removed some implementation details from the runpy module documentation.
Nick Coghlan <ncoghlan@gmail.com>
parents: 55002
diff changeset
240 data = kill_python(p)
58460
17891566a478 use assert[Not]In where appropriate
Ezio Melotti <ezio.melotti@gmail.com>
parents: 58198
diff changeset
241 self.assertIn(run_name, data)
50162
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
242
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
243
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
244 def test_main():
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
245 test.test_support.run_unittest(ZipSupportTests)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
246 test.test_support.reap_children()
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
247
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
248 if __name__ == '__main__':
4264cf00a75c Merged revisions 67750-67751 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
249 test_main()