diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-08-28 01:23:52 +0200 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-08-28 01:23:52 +0200 |
| commit | d54fa555cba8bb6d26469a5cc283c468a03f0db8 (patch) | |
| tree | 8ebc35e09417239c9efab4240ba09fd97a843ed0 /Lib/test/test_smtplib.py | |
| parent | 6b2e160d279c031d714206007e22df9e177de44e (diff) | |
| download | cpython-git-d54fa555cba8bb6d26469a5cc283c468a03f0db8.tar.gz | |
Make tests faster by reaping threads only at the end
Diffstat (limited to 'Lib/test/test_smtplib.py')
| -rw-r--r-- | Lib/test/test_smtplib.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py index d94c88e8be..2cb0d1ab52 100644 --- a/Lib/test/test_smtplib.py +++ b/Lib/test/test_smtplib.py @@ -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, |