Merge "adb: skip IPv6 test if IPv6 isn't available." am: 46e59af921

am: c4072ed605 Change-Id: I5e66a4c56247e7f588feece0d1d8f6dee2dda278
2018-03-20 07:34:18 +00:00 · 2018-03-20 07:34:18 +00:00 · fb2f969286
parent 977abec8a6 c4072ed605
commit fb2f969286
1 changed files with 6 additions and 2 deletions
--- a/adb/test_adb.py
+++ b/adb/test_adb.py
@ -217,8 +217,12 @@ class NonApiTest(unittest.TestCase):
        ipv4.listen(1)

        ipv6 = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-        ipv6.bind(('::1', ipv4.getsockname()[1] + 1))
-        ipv6.listen(1)
+        try:
+            ipv6.bind(('::1', ipv4.getsockname()[1] + 1))
+            ipv6.listen(1)
+        except socket.error:
+            print("IPv6 not available, skipping")
+            return

        for s in (ipv4, ipv6):
            port = s.getsockname()[1]