[Python-modules-commits] [py-macaroon-bakery] 02/04: Isolate client tests from any HTTP proxy

[Colin Watson]

This is an automated email from the git hooks/post-receive script.

cjwatson pushed a commit to branch master
in repository py-macaroon-bakery.

commit 00ab469a4ae426c346228bd68eabe0fd4e689e4c
Author: Colin Watson <cjwatson at debian.org>
Date:   Mon Nov 6 10:27:10 2017 +0000

    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
---
 macaroonbakery/tests/test_bakery.py | 6 ++++++
 macaroonbakery/tests/test_client.py | 7 +++++++
 2 files changed, 13 insertions(+)

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 ab20c3b..04e2f2b 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)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/py-macaroon-bakery.git