mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-23 17:03:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-45185: enables TestEnumerations in test_ssl (GH-28330)

Browse source
This commit is contained in:
Nikita Sobolev 2021-09-15 19:57:03 +03:00 • committed by GitHub
parent cbeb819710
commit d897579a80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/test/test_ssl.py
View file

@ -4969,17 +4969,18 @@ class TestEnumerations(unittest.TestCase):
lambda name: name.startswith('PROTOCOL_') and name != 'PROTOCOL_SSLv23', lambda name: name.startswith('PROTOCOL_') and name != 'PROTOCOL_SSLv23',
source=ssl._ssl, source=ssl._ssl,
) )
# This member is assigned dynamically in `ssl.py`:
Checked_SSLMethod.PROTOCOL_SSLv23 = Checked_SSLMethod.PROTOCOL_TLS
enum._test_simple_enum(Checked_SSLMethod, ssl._SSLMethod) enum._test_simple_enum(Checked_SSLMethod, ssl._SSLMethod)
def test_options(self): def test_options(self):
CheckedOptions = enum._old_convert_( CheckedOptions = enum._old_convert_(
enum.FlagEnum, 'Options', 'ssl', enum.IntFlag, 'Options', 'ssl',
lambda name: name.startswith('OP_'), lambda name: name.startswith('OP_'),
source=ssl._ssl, source=ssl._ssl,
) )
enum._test_simple_enum(CheckedOptions, ssl.Options) enum._test_simple_enum(CheckedOptions, ssl.Options)
def test_alertdescription(self): def test_alertdescription(self):
CheckedAlertDescription = enum._old_convert_( CheckedAlertDescription = enum._old_convert_(
enum.IntEnum, 'AlertDescription', 'ssl', enum.IntEnum, 'AlertDescription', 'ssl',
@ -4989,16 +4990,16 @@ class TestEnumerations(unittest.TestCase):
enum._test_simple_enum(CheckedAlertDescription, ssl.AlertDescription) enum._test_simple_enum(CheckedAlertDescription, ssl.AlertDescription)
def test_sslerrornumber(self): def test_sslerrornumber(self):
Checked_SSLMethod = enum._old_convert_( Checked_SSLErrorNumber = enum._old_convert_(
enum.IntEnum, '_SSLMethod', 'ssl', enum.IntEnum, 'SSLErrorNumber', 'ssl',
lambda name: name.startswith('PROTOCOL_') and name != 'PROTOCOL_SSLv23', lambda name: name.startswith('SSL_ERROR_'),
source=ssl._ssl, source=ssl._ssl,
) )
enum._test_simple_enum(Checked_SSLMethod, ssl._SSLMethod) enum._test_simple_enum(Checked_SSLErrorNumber, ssl.SSLErrorNumber)
def test_verifyflags(self): def test_verifyflags(self):
CheckedVerifyFlags = enum._old_convert_( CheckedVerifyFlags = enum._old_convert_(
enum.FlagEnum, 'VerifyFlags', 'ssl', enum.IntFlag, 'VerifyFlags', 'ssl',
lambda name: name.startswith('VERIFY_'), lambda name: name.startswith('VERIFY_'),
source=ssl._ssl, source=ssl._ssl,
) )
@ -5012,6 +5013,7 @@ class TestEnumerations(unittest.TestCase):
) )
enum._test_simple_enum(CheckedVerifyMode, ssl.VerifyMode) enum._test_simple_enum(CheckedVerifyMode, ssl.VerifyMode)
def test_main(verbose=False): def test_main(verbose=False):
if support.verbose: if support.verbose:
plats = { plats = {
@ -5046,7 +5048,7 @@ def test_main(verbose=False):
tests = [ tests = [
ContextTests, BasicSocketTests, SSLErrorTests, MemoryBIOTests, ContextTests, BasicSocketTests, SSLErrorTests, MemoryBIOTests,
SSLObjectTests, SimpleBackgroundTests, ThreadedTests, SSLObjectTests, SimpleBackgroundTests, ThreadedTests,
TestPostHandshakeAuth, TestSSLDebug TestPostHandshakeAuth, TestSSLDebug, TestEnumerations,
] ]
if support.is_resource_enabled('network'): if support.is_resource_enabled('network'):

1
Misc/NEWS.d/next/Tests/2021-09-14-14-54-04.bpo-45185.qFx5I6.rst Normal file
View file

@ -0,0 +1 @@
Enables ``TestEnumerations`` test cases in ``test_ssl`` suite.