Merge ab8c6d61cd into dd96032e12

This reverts commit 0bb188a077, reversing
changes made to 45bdfa582d.

test/functional/test_framework/netutil.py

@@ -146,12 +146,10 @@ def test_ipv6_local():
     '''
     # By using SOCK_DGRAM this will not actually make a connection, but it will
     # fail if there is no route to IPv6 localhost.
-    return False
+    have_ipv6 = True
-    # TODO: disabled until amazon ipv6 issues are resolved
+    try:
-    # have_ipv6 = True
+        s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
-    # try:
+        s.connect(('::1', 1))
-    #     s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
+    except socket.error:
-    #     s.connect(('::1', 1))
+        have_ipv6 = False
-    # except socket.error:
+    return have_ipv6
-    #     have_ipv6 = False
-    # return have_ipv6