commit 1b9c1b2ffdcebfa27119bf6b21f3090daf22a7e9
author Josh Gao <jmgao@google.com> Tue Mar 20 07:18:12 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 20 07:18:12 2018 +0000
tree 0dd341aaa61756b5989e266ff9b9a69f42733a76
parent b50570daa0481559ec2a1c5516de5846c099c62b
parent c58767a7f596634671d435b102aeaf7651385f8c

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

adb/test_adb.py

diff --git a/adb/test_adb.py b/adb/test_adb.py
index 98c8a59..e771106 100644
--- a/adb/test_adb.py
+++ b/adb/test_adb.py
@@ -217,8 +217,12 @@
         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]