From 659c6d3a7eefcf301f33270c2c1d4f886009b6a6 Mon Sep 17 00:00:00 2001 From: Andrey Trubachev Date: Sat, 3 Jan 2015 10:32:27 +0300 Subject: [PATCH] Fix 'wait_for' doesn't work with ipv6only host --- utilities/logic/wait_for.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/utilities/logic/wait_for.py b/utilities/logic/wait_for.py index ae316fe1a17..41852148971 100644 --- a/utilities/logic/wait_for.py +++ b/utilities/logic/wait_for.py @@ -351,10 +351,8 @@ def main(): except IOError: break elif port: - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.settimeout(connect_timeout) try: - s.connect( (host, port) ) + s = socket.create_connection( (host, port), connect_timeout) s.shutdown(socket.SHUT_RDWR) s.close() time.sleep(1) @@ -397,10 +395,8 @@ def main(): elapsed = datetime.datetime.now() - start module.fail_json(msg="Failed to stat %s, %s" % (path, e.strerror), elapsed=elapsed.seconds) elif port: - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.settimeout(connect_timeout) try: - s.connect( (host, port) ) + s = socket.create_connection( (host, port), connect_timeout) if search_regex: data = '' matched = False