# HG changeset patch # User Jun Wu # Date 1487204542 28800 # Node ID 1f803482844afd22b8dbc0846cda307214d79da9 # Parent 15f9084a9a0c7d88153d6de416c6529b702a7f04 runtests: checkportisavailable should only check one family As explained by the previous patch, checkportisavailable() should only check the preferred family - either IPv4 or IPv6, not both. This patch makes it so. diff -r 15f9084a9a0c -r 1f803482844a tests/run-tests.py --- a/tests/run-tests.py Wed Feb 15 16:18:31 2017 -0800 +++ b/tests/run-tests.py Wed Feb 15 16:22:22 2017 -0800 @@ -137,10 +137,11 @@ def checkportisavailable(port): """return true if a port seems free to bind on localhost""" - families = [getattr(socket, i, None) - for i in ('AF_INET', 'AF_INET6') - if getattr(socket, i, None) is not None] - for family in families: + if useipv6: + family = socket.AF_INET6 + else: + family = socket.AF_INET + if True: try: s = socket.socket(family, socket.SOCK_STREAM) s.bind(('localhost', port))