summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-11-06 10:27:10 +0000
committerColin Watson <cjwatson@debian.org>2019-12-26 22:46:22 +0000
commita583a4025a5ddc09a2e56f89f371c6b1d8dc768e (patch)
tree90c042f8cd0311d303b2b2fad112908f9eb0be65
parentebd001f130fd5c9559072f115cb7124422033036 (diff)
Isolate client tests from any HTTP proxy
Debian's Python packaging tools set http_proxy to a non-existent proxy to help flush out packages that try to talk to the network during build, but these tests could previously fail in more normal development environments too. Forwarded: https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/28 Last-Update: 2018-02-05 Patch-Name: isolate-from-proxy.patch Gbp-Pq: Name isolate-from-proxy.patch
-rw-r--r--macaroonbakery/tests/test_bakery.py6
-rw-r--r--macaroonbakery/tests/test_client.py7
2 files changed, 13 insertions, 0 deletions
diff --git a/macaroonbakery/tests/test_bakery.py b/macaroonbakery/tests/test_bakery.py
index a6c3e58..72a6928 100644
--- a/macaroonbakery/tests/test_bakery.py
+++ b/macaroonbakery/tests/test_bakery.py
@@ -1,5 +1,6 @@
# Copyright 2017 Canonical Ltd.
# Licensed under the LGPLv3, see LICENCE file for details.
+import os
from unittest import TestCase
import macaroonbakery.httpbakery as httpbakery
@@ -171,6 +172,11 @@ def wait_on_error(url, request):
class TestBakery(TestCase):
+ def setUp(self):
+ super(TestBakery, self).setUp()
+ # http_proxy would cause requests to talk to the proxy, which is
+ # unlikely to know how to talk to the test server.
+ os.environ.pop('http_proxy', None)
def assert_cookie_security(self, cookies, name, secure):
for cookie in cookies:
diff --git a/macaroonbakery/tests/test_client.py b/macaroonbakery/tests/test_client.py
index b03bafa..2ae08d3 100644
--- a/macaroonbakery/tests/test_client.py
+++ b/macaroonbakery/tests/test_client.py
@@ -3,6 +3,7 @@
import base64
import datetime
import json
+import os
import threading
from unittest import TestCase
@@ -27,6 +28,12 @@ TEST_OP = bakery.Op(entity='test', action='test')
class TestClient(TestCase):
+ def setUp(self):
+ super(TestClient, self).setUp()
+ # http_proxy would cause requests to talk to the proxy, which is
+ # unlikely to know how to talk to the test server.
+ os.environ.pop('http_proxy', None)
+
def test_single_service_first_party(self):
b = new_bakery('loc', None, None)