Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Make tests faster by reaping threads only at the end

This commit is contained in:
Antoine Pitrou 2011-08-28 01:24:22 +02:00
parent a5dba1abea d54fa555cb
commit 76f570a9c6
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_smtplib.py
View File

@ -177,7 +177,6 @@ class DebuggingServerTests(unittest.TestCase):
self.output = io.StringIO() self.output = io.StringIO()
sys.stdout = self.output sys.stdout = self.output
self._threads = support.threading_setup()
self.serv_evt = threading.Event() self.serv_evt = threading.Event()
self.client_evt = threading.Event() self.client_evt = threading.Event()
# Capture SMTPChannel debug output # Capture SMTPChannel debug output
@ -202,7 +201,6 @@ class DebuggingServerTests(unittest.TestCase):
# wait for the server thread to terminate # wait for the server thread to terminate
self.serv_evt.wait() self.serv_evt.wait()
self.thread.join() self.thread.join()
support.threading_cleanup(*self._threads)
# restore sys.stdout # restore sys.stdout
sys.stdout = self.old_stdout sys.stdout = self.old_stdout
# restore DEBUGSTREAM # restore DEBUGSTREAM
@ -681,7 +679,6 @@ class SMTPSimTests(unittest.TestCase):
def setUp(self): def setUp(self):
self.real_getfqdn = socket.getfqdn self.real_getfqdn = socket.getfqdn
socket.getfqdn = mock_socket.getfqdn socket.getfqdn = mock_socket.getfqdn
self._threads = support.threading_setup()
self.serv_evt = threading.Event() self.serv_evt = threading.Event()
self.client_evt = threading.Event() self.client_evt = threading.Event()
# Pick a random unused port by passing 0 for the port number # Pick a random unused port by passing 0 for the port number
@ -703,7 +700,6 @@ class SMTPSimTests(unittest.TestCase):
# wait for the server thread to terminate # wait for the server thread to terminate
self.serv_evt.wait() self.serv_evt.wait()
self.thread.join() self.thread.join()
support.threading_cleanup(*self._threads)
def testBasic(self): def testBasic(self):
# smoke test # smoke test
@ -816,6 +812,7 @@ class SMTPSimTests(unittest.TestCase):
#test infrastructure can support it. #test infrastructure can support it.
@support.reap_threads
def test_main(verbose=None): def test_main(verbose=None):
support.run_unittest(GeneralTests, DebuggingServerTests, support.run_unittest(GeneralTests, DebuggingServerTests,
NonConnectingTests, NonConnectingTests,