Commit dbed7a73 authored by Brett Cannon's avatar Brett Cannon

Make test_runpy re-entrant.

parent 87997567
...@@ -4,7 +4,7 @@ import os ...@@ -4,7 +4,7 @@ import os
import os.path import os.path
import sys import sys
import tempfile import tempfile
from test.test_support import verbose, run_unittest from test.test_support import verbose, run_unittest, forget
from runpy import _run_module_code, run_module from runpy import _run_module_code, run_module
# Set up the test code and expected results # Set up the test code and expected results
...@@ -156,6 +156,7 @@ class RunModuleTest(unittest.TestCase): ...@@ -156,6 +156,7 @@ class RunModuleTest(unittest.TestCase):
def _check_module(self, depth): def _check_module(self, depth):
pkg_dir, mod_fname, mod_name = ( pkg_dir, mod_fname, mod_name = (
self._make_pkg("x=1\n", depth)) self._make_pkg("x=1\n", depth))
forget(mod_name)
try: try:
if verbose: print "Running from source:", mod_name if verbose: print "Running from source:", mod_name
d1 = run_module(mod_name) # Read from source d1 = run_module(mod_name) # Read from source
......
...@@ -832,6 +832,10 @@ Extension Modules ...@@ -832,6 +832,10 @@ Extension Modules
Tests Tests
----- -----
- Make test_runpy reentrant by fixing _check_module to clear out any module
being tested. Was causing an error by __import__ doing a reload on the
second run and thus suppressing bytecode recreation.
- Capture socket connection resets and timeouts in test_socket_ssl and - Capture socket connection resets and timeouts in test_socket_ssl and
test_urllib2net and raise test.test_support.ResourceDenied. test_urllib2net and raise test.test_support.ResourceDenied.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment