[Python-checkins] cpython: Fix more ResourceWarnings in test_packaging moving the join() and

[ezio.melotti]

http://hg.python.org/cpython/rev/a1a2928461db
changeset:   70227:a1a2928461db
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri May 20 19:35:58 2011 +0300
summary:
  Fix more ResourceWarnings in test_packaging moving the join() and server_close() in the stop method.

files:
  Lib/packaging/tests/pypi_server.py |  9 +++------
  1 files changed, 3 insertions(+), 6 deletions(-)


diff --git a/Lib/packaging/tests/pypi_server.py b/Lib/packaging/tests/pypi_server.py
--- a/Lib/packaging/tests/pypi_server.py
+++ b/Lib/packaging/tests/pypi_server.py
@@ -78,12 +78,7 @@
         super(PyPIServerTestCase, self).setUp()
         self.pypi = PyPIServer()
         self.pypi.start()
-
-    def tearDown(self):
-        super(PyPIServerTestCase, self).tearDown()
-        self.pypi.stop()
-        self.pypi.join()
-        self.pypi.server.server_close()
+        self.addCleanup(self.pypi.stop)
 
 
 class PyPIServer(threading.Thread):
@@ -154,6 +149,8 @@
     def stop(self):
         """self shutdown is not supported for python < 2.6"""
         self._run = False
+        self.join()
+        self.server.server_close()
 
     def get_next_response(self):
         return (self.default_response_status,

-- 
Repository URL: http://hg.python.org/cpython