mirror of
https://github.com/python/cpython.git
synced 2024-12-01 05:45:40 +08:00
#17333: merge with 3.3.
This commit is contained in:
commit
5c67e22145
@ -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()
|
||||
|
@ -899,6 +899,9 @@ Tests
|
||||
|
||||
- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
|
||||
|
||||
- Issue #17333: test_imaplib now works with unittest test discovery.
|
||||
Patch by Zachary Ware.
|
||||
|
||||
- Issue #17082: test_dbm* now work with unittest test discovery.
|
||||
Patch by Zachary Ware.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user