commit d4038cbec64b4e61ffe4ade0c1d8ccd37adaf904
author Josh Gao <jmgao@google.com> Tue Mar 20 07:19:01 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 20 07:19:01 2018 +0000
tree 64166321e33a724ae700bbbf52e20cf08c0734fc
parent 1b9c1b2ffdcebfa27119bf6b21f3090daf22a7e9
parent 589a57749e9b7b33babb5f95655ce6ed703ab953

Merge changes I6a842960,If618c26b

* changes:
  adb: add `adb shell exit 42` stress test.
  adb: improve socket tests.

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]