Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb2f9692 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

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

am: c4072ed6

Change-Id: I5e66a4c56247e7f588feece0d1d8f6dee2dda278
parents 977abec8 c4072ed6
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -217,8 +217,12 @@ class NonApiTest(unittest.TestCase):
        ipv4.listen(1)

        ipv6 = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
        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]