commit 4abb5074bebe7e001ff4a8373718b3ce7fcfdc61
author Josh Gao <jmgao@google.com> Mon Mar 19 18:18:21 2018 -0700
committer Josh Gao <jmgao@google.com> Mon Mar 19 18:19:47 2018 -0700
tree 0dd341aaa61756b5989e266ff9b9a69f42733a76
parent 6156420fb74d2695b15599b3eb1624a2269c4c11

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

Bug: http://b/69813298
Test: none
Change-Id: I0793e793bd52c5f1c639faedf09a513df263db78

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]