[Python-checkins] cpython: test_packaging should clean up after itself (but it doesn't really)
antoine.pitrou
python-checkins at python.org
Fri Jul 15 23:27:40 CEST 2011
http://hg.python.org/cpython/rev/420a27e0183c
changeset: 71372:420a27e0183c
user: Antoine Pitrou <solipsis at pitrou.net>
date: Fri Jul 15 23:26:19 2011 +0200
summary:
test_packaging should clean up after itself (but it doesn't really)
files:
Lib/packaging/tests/__main__.py | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Lib/packaging/tests/__main__.py b/Lib/packaging/tests/__main__.py
--- a/Lib/packaging/tests/__main__.py
+++ b/Lib/packaging/tests/__main__.py
@@ -5,15 +5,18 @@
import os
import sys
import unittest
-from test.support import run_unittest, reap_children
+from test.support import run_unittest, reap_children, reap_threads
+ at reap_threads
def test_main():
- start_dir = os.path.dirname(__file__)
- top_dir = os.path.dirname(os.path.dirname(start_dir))
- test_loader = unittest.TestLoader()
- run_unittest(test_loader.discover(start_dir, top_level_dir=top_dir))
- reap_children()
+ try:
+ start_dir = os.path.dirname(__file__)
+ top_dir = os.path.dirname(os.path.dirname(start_dir))
+ test_loader = unittest.TestLoader()
+ run_unittest(test_loader.discover(start_dir, top_level_dir=top_dir))
+ finally:
+ reap_children()
if __name__ == '__main__':
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list