diff options
authorColin Watson <>2017-11-06 10:27:10 +0000
committerColin Watson <>2017-11-10 15:50:41 +0000
commit530e1e702c8743fc8ea93db035bf86f6c07e6d09 (patch)
parent949b7072cabce0daed6c94993ad44c8ea8648dbd (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: Last-Update: 2017-11-06 Patch-Name: isolate-from-proxy.patch
1 files changed, 7 insertions, 0 deletions
diff --git a/macaroonbakery/tests/ b/macaroonbakery/tests/
index e1a4009..8263f54 100644
--- a/macaroonbakery/tests/
+++ b/macaroonbakery/tests/
@@ -3,6 +3,7 @@
import base64
import datetime
import json
+import os
from unittest import TestCase
from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
@@ -26,6 +27,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)