From 9b93cc884f3f93d25999fe47bb50fbc67552ca31 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 9 Mar 2016 10:05:49 +0100 Subject: [PATCH] validate:launcher: Remove dependency on wget --- validate/launcher/httpserver.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/validate/launcher/httpserver.py b/validate/launcher/httpserver.py index bdc7120..42dc003 100644 --- a/validate/launcher/httpserver.py +++ b/validate/launcher/httpserver.py @@ -22,6 +22,7 @@ import time import loggable import subprocess import sys +import urllib2 logcat = "httpserver" @@ -41,12 +42,10 @@ class HTTPServer(loggable.Loggable): start = time.time() while True: try: - subprocess.check_output(["wget", "127.0.0.1:%s" % - (self.options.http_server_port), - "-O", os.devnull], - stderr=self._logsfile) + response = urllib2.urlopen('http://127.0.0.1:%s' % ( + self.options.http_server_port)) return True - except subprocess.CalledProcessError: + except urllib2.URLError as e: pass if time.time() - start > timeout: -- 2.7.4