Commit af2acd0c authored by Jason Madden's avatar Jason Madden

Fix test_ares_timeout to not require a root port. Because it is still a...

Fix test_ares_timeout to not require a root port. Because it is still a constant port, don't fail the test if it can't be bound, like 7960b8c3.
parent 7f2c2c1b
from __future__ import print_function from __future__ import print_function
import sys import sys
import errno
import gevent import gevent
try: try:
from gevent.resolver_ares import Resolver from gevent.resolver_ares import Resolver
...@@ -9,13 +10,14 @@ except ImportError as ex: ...@@ -9,13 +10,14 @@ except ImportError as ex:
from gevent import socket from gevent import socket
print(gevent.__file__) print(gevent.__file__)
address = ('127.0.0.10', 53) address = ('', 7153)
listener = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) listener = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
try: try:
listener.bind(address) listener.bind(address)
except socket.error as ex: except socket.error as ex:
if 'permission denied' in str(ex).lower(): if ex.errno in (errno.EPERM, errno.EADDRNOTAVAIL) or 'permission denied' in str(ex).lower():
sys.stderr.write('This test binds on port 53 and thus must be run as root.\n') sys.stderr.write('This test binds on port a port that was already in use or not allowed.\n')
sys.exit(0) sys.exit(0)
raise raise
...@@ -26,7 +28,7 @@ def reader(): ...@@ -26,7 +28,7 @@ def reader():
gevent.spawn(reader) gevent.spawn(reader)
r = gevent.get_hub().resolver = Resolver(servers=['127.0.0.10'], timeout=0.001, tries=1) r = gevent.get_hub().resolver = Resolver(servers=['127.0.0.1'], timeout=0.001, tries=1, udp_port=address[-1])
try: try:
result = r.gethostbyname('www.google.com') result = r.gethostbyname('www.google.com')
except socket.gaierror as ex: except socket.gaierror as ex:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment