commit c2684c6d62978e9ce8256c3c7744d0332a2abe4c
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Sun Jun 30 08:42:22 2019 -0700
committer GitHub <noreply@github.com> Sun Jun 30 08:42:22 2019 -0700
tree 4e7484fbb1aaabfcf3fe7d089d80e3c00c9e7903
parent bf8cb31803558f1105efb15b0ee4bd184f3218c8

bpo-37199: Fix test failures when IPv6 is unavailable or disabled (GH-14480)

(cherry picked from commit c2cda638d63b98f5cf9a8ef13e15aace2b7e3f0b)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>

Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 7ba8156..38fdf3f 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -673,7 +673,7 @@
         fail(cert, 'example.net')
 
         # -- IPv6 matching --
-        if hasattr(socket, 'AF_INET6'):
+        if support.IPV6_ENABLED:
             cert = {'subject': ((('commonName', 'example.com'),),),
                     'subjectAltName': (
                         ('DNS', 'example.com'),
@@ -754,7 +754,7 @@
                 ssl._inet_paton(invalid)
         for ipaddr in ['127.0.0.1', '192.168.0.1']:
             self.assertTrue(ssl._inet_paton(ipaddr))
-        if hasattr(socket, 'AF_INET6'):
+        if support.IPV6_ENABLED:
             for ipaddr in ['::1', '2001:db8:85a3::8a2e:370:7334']:
                 self.assertTrue(ssl._inet_paton(ipaddr))