traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make tests faster by reaping threads only at the end

This commit is contained in:
Antoine Pitrou 2011-08-28 01:23:52 +02:00
parent 6b2e160d27
commit d54fa555cb
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

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