mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 19:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Don't let cleanup errors mask real errors in the runpy tests

Browse source
This commit is contained in:
Nick Coghlan 2006-03-15 13:11:54 +00:00
parent a2173a189a
commit 586b83c4bb
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/test/test_runpy.py
View file

@ -116,17 +116,30 @@ class RunModuleTest(unittest.TestCase):
for i in range(depth+1): # Don't forget the module itself for i in range(depth+1): # Don't forget the module itself
parts = mod_name.rsplit(".", i) parts = mod_name.rsplit(".", i)
entry = parts[0] entry = parts[0]
del sys.modules[entry] try:
del sys.modules[entry]
except KeyError, ex:
if verbose: print ex # Persist with cleaning up
if verbose: print " Removed sys.modules entries" if verbose: print " Removed sys.modules entries"
del sys.path[0] del sys.path[0]
if verbose: print " Removed sys.path entry" if verbose: print " Removed sys.path entry"
for root, dirs, files in os.walk(top, topdown=False): for root, dirs, files in os.walk(top, topdown=False):
for name in files: for name in files:
os.remove(os.path.join(root, name)) try:
os.remove(os.path.join(root, name))
except OSError, ex:
if verbose: print ex # Persist with cleaning up
for name in dirs: for name in dirs:
os.rmdir(os.path.join(root, name)) fullname = os.path.join(root, name)
os.rmdir(top) try:
if verbose: print " Removed package tree" os.rmdir(fullname)
except OSError, ex:
if verbose: print ex # Persist with cleaning up
try:
os.rmdir(top)
if verbose: print " Removed package tree"
except OSError, ex:
if verbose: print ex # Persist with cleaning up
def _check_module(self, depth): def _check_module(self, depth):
pkg_dir, mod_fname, mod_name = ( pkg_dir, mod_fname, mod_name = (