diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-02 12:33:05 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-02 12:33:05 (GMT) |
| commit | 5c67e22145d55e10805a702c8ca0d72298b29b3d (patch) | |
| tree | 0b8e76273640d60e8f10ccd1b185de6aa623fc2b /Lib | |
| parent | a35e281200c16e3c725462463562c6928f38c54f (diff) | |
| parent | 02bf701b25b6519422c12dd546be348abe07f032 (diff) | |
| download | cpython-5c67e22145d55e10805a702c8ca0d72298b29b3d.zip cpython-5c67e22145d55e10805a702c8ca0d72298b29b3d.tar.gz cpython-5c67e22145d55e10805a702c8ca0d72298b29b3d.tar.bz2 | |
#17333: merge with 3.3.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_imaplib.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py index 30ae6a4..c37ea1d 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -444,7 +444,7 @@ class RemoteIMAP_SSLTest(RemoteIMAPTest): keyfile=CERTFILE, ssl_context=self.create_ssl_context()) -def test_main(): +def load_tests(*args): tests = [TestImaplib] if support.is_resource_enabled('network'): @@ -459,9 +459,9 @@ def test_main(): RemoteIMAPTest, RemoteIMAP_SSLTest, RemoteIMAP_STARTTLSTest, ]) - support.run_unittest(*tests) + return unittest.TestSuite([unittest.makeSuite(test) for test in tests]) if __name__ == "__main__": support.use_resources = ['network'] - test_main() + unittest.main() |