From aa713e71e9bc6f6951391680eabfc2da9b72a32e Mon Sep 17 00:00:00 2001 From: Andrei Otcheretianski Date: Thu, 7 Apr 2016 13:32:05 +0300 Subject: [PATCH] tests: Don't use proxy in urllib.urlopen() Some environments define default system wide HTTP proxy. Using default system configuration may result in a failure to open some HTTP URLs. Fix this by ensuring that no proxies are used. Signed-off-by: Andrei Otcheretianski --- tests/hwsim/test_ap_wps.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/hwsim/test_ap_wps.py b/tests/hwsim/test_ap_wps.py index 4f178a4e1..db1225705 100644 --- a/tests/hwsim/test_ap_wps.py +++ b/tests/hwsim/test_ap_wps.py @@ -2696,7 +2696,7 @@ def ssdp_get_location(uuid): return location def upnp_get_urls(location): - conn = urllib.urlopen(location) + conn = urllib.urlopen(location, proxies={}) tree = ET.parse(conn) root = tree.getroot() urn = '{urn:schemas-upnp-org:device-1-0}' @@ -2748,10 +2748,11 @@ def test_ap_wps_upnp(dev, apdev): location = ssdp_get_location(ap_uuid) urls = upnp_get_urls(location) - conn = urllib.urlopen(urls['scpd_url']) + conn = urllib.urlopen(urls['scpd_url'], proxies={}) scpd = conn.read() - conn = urllib.urlopen(urlparse.urljoin(location, "unknown.html")) + conn = urllib.urlopen(urlparse.urljoin(location, "unknown.html"), + proxies={}) if conn.getcode() != 404: raise Exception("Unexpected HTTP response to GET unknown URL")