diff options
author | Colin Watson <cjwatson@debian.org> | 2017-12-12 15:20:49 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-02-05 15:58:12 +0000 |
commit | 533dfe1ab9feb21173bd3a1825a5f2afd95801a8 (patch) | |
tree | ed0fb92dc1429422669e5bbc10c66cc84efae321 /debian/patches/isolate-from-proxy.patch | |
parent | efd539f35f910d375a8b3eac5c66be048c5a02b6 (diff) | |
parent | 00ab469a4ae426c346228bd68eabe0fd4e689e4c (diff) |
New upstream release (1.1.0)
Diffstat (limited to 'debian/patches/isolate-from-proxy.patch')
-rw-r--r-- | debian/patches/isolate-from-proxy.patch | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/debian/patches/isolate-from-proxy.patch b/debian/patches/isolate-from-proxy.patch index 89d7af6..46df46e 100644 --- a/debian/patches/isolate-from-proxy.patch +++ b/debian/patches/isolate-from-proxy.patch @@ -1,4 +1,4 @@ -From 530e1e702c8743fc8ea93db035bf86f6c07e6d09 Mon Sep 17 00:00:00 2001 +From 00ab469a4ae426c346228bd68eabe0fd4e689e4c Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwatson@debian.org> Date: Mon, 6 Nov 2017 10:27:10 +0000 Subject: Isolate client tests from any HTTP proxy @@ -9,15 +9,39 @@ 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: 2017-11-06 +Last-Update: 2018-02-05 Patch-Name: isolate-from-proxy.patch --- + macaroonbakery/tests/test_bakery.py | 6 ++++++ macaroonbakery/tests/test_client.py | 7 +++++++ - 1 file changed, 7 insertions(+) + 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 e1a4009..8263f54 100644 +index ab20c3b..04e2f2b 100644 --- a/macaroonbakery/tests/test_client.py +++ b/macaroonbakery/tests/test_client.py @@ -3,6 +3,7 @@ @@ -25,10 +49,10 @@ index e1a4009..8263f54 100644 import datetime import json +import os + import threading from unittest import TestCase - try: - from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler -@@ -26,6 +27,12 @@ TEST_OP = bakery.Op(entity='test', action='test') + +@@ -27,6 +28,12 @@ TEST_OP = bakery.Op(entity='test', action='test') class TestClient(TestCase): |