summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/improve-unknown-interaction-mock.patch57
-rw-r--r--debian/patches/isolate-from-proxy.patch67
-rw-r--r--debian/patches/series2
3 files changed, 126 insertions, 0 deletions
diff --git a/debian/patches/improve-unknown-interaction-mock.patch b/debian/patches/improve-unknown-interaction-mock.patch
new file mode 100644
index 0000000..c885b7a
--- /dev/null
+++ b/debian/patches/improve-unknown-interaction-mock.patch
@@ -0,0 +1,57 @@
+From c1850c8a10886894255100fae185c450e800564a Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Fri, 9 Feb 2018 21:54:21 +0000
+Subject: Improve mock setup for 407-then-unknown test
+
+`test_407_then_unknown_interaction_methods` causes the client to fetch
+the possible methods supported by the discharger (because it's told that
+it only supports a non-window method). This is currently unmocked,
+which causes the client to actually contact `http://example.com/visit`.
+This fails in Launchpad builds because they run with a restrictive
+network setup that doesn't even expose DNS lookups for non-permitted
+hosts.
+
+There isn't really a good way to simulate this without setting up a
+similar stunt DNS server (though perhaps installing an
+`httmock.all_requests` fallback mock that raises an exception would be a
+good idea?), but this seems to be the only failure at the moment.
+
+Forwarded: https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/45
+Last-Update: 2018-02-09
+
+Patch-Name: improve-unknown-interaction-mock.patch
+---
+ macaroonbakery/tests/test_bakery.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/macaroonbakery/tests/test_bakery.py b/macaroonbakery/tests/test_bakery.py
+index 72a6928..1883987 100644
+--- a/macaroonbakery/tests/test_bakery.py
++++ b/macaroonbakery/tests/test_bakery.py
+@@ -146,6 +146,16 @@ def discharge_401(url, request):
+ }
+
+
++@urlmatch(path='.*/visit')
++def visit_200(url, request):
++ return {
++ 'status_code': 200,
++ 'content': {
++ 'interactive': '/visit'
++ }
++ }
++
++
+ @urlmatch(path='.*/wait')
+ def wait_after_401(url, request):
+ if request.url != 'http://example.com/wait':
+@@ -245,7 +255,8 @@ class TestBakery(TestCase):
+ def kind(self):
+ return 'unknown'
+ client = httpbakery.Client(interaction_methods=[UnknownInteractor()])
+- with HTTMock(first_407_then_200), HTTMock(discharge_401):
++ with HTTMock(first_407_then_200), HTTMock(discharge_401),\
++ HTTMock(visit_200):
+ with self.assertRaises(httpbakery.InteractionError) as exc:
+ requests.get(
+ ID_PATH,
diff --git a/debian/patches/isolate-from-proxy.patch b/debian/patches/isolate-from-proxy.patch
new file mode 100644
index 0000000..2648b94
--- /dev/null
+++ b/debian/patches/isolate-from-proxy.patch
@@ -0,0 +1,67 @@
+From 68863455145e5ca2ff2091c1e5c31b2a6bf05140 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
+
+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)
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f8e7d6e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+isolate-from-proxy.patch
+improve-unknown-interaction-mock.patch