diff options
author | Ondřej Nový <onovy@debian.org> | 2018-08-08 09:17:28 +0200 |
---|---|---|
committer | Ondřej Nový <onovy@debian.org> | 2018-08-08 09:17:28 +0200 |
commit | ae33a39d857b367e216f1e80530c09087b108d16 (patch) | |
tree | f1e3d6874fe072cb60f3951fbde1fed5e2a565a0 | |
parent | 4c050a9d710ec8be375844a45dc2d4cf760dca7a (diff) |
Convert git repository from git-dpm to gbp layout
-rw-r--r-- | debian/.git-dpm | 11 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | macaroonbakery/tests/test_bakery.py | 19 | ||||
-rw-r--r-- | macaroonbakery/tests/test_client.py | 7 |
4 files changed, 7 insertions, 36 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm deleted file mode 100644 index ffca26b..0000000 --- a/debian/.git-dpm +++ /dev/null @@ -1,11 +0,0 @@ -# see git-dpm(1) from git-dpm package -d918563db4de954c3df719d06a31bdd3aec3a8fc -d918563db4de954c3df719d06a31bdd3aec3a8fc -4379a501141f75557e535f9c2ef3b58ef362259c -4379a501141f75557e535f9c2ef3b58ef362259c -py-macaroon-bakery_1.1.3.orig.tar.gz -0531fe0fcaa20b9554b17347b36a1b3c4cb84e06 -82450 -debianTag="debian/%e%v" -patchedTag="patched/%e%v" -upstreamTag="upstream/%e%u" diff --git a/debian/changelog b/debian/changelog index c6fb23b..3e33b2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +py-macaroon-bakery (1.1.3-2) UNRELEASED; urgency=medium + + * Convert git repository from git-dpm to gbp layout + + -- Ondřej Nový <onovy@debian.org> Wed, 08 Aug 2018 09:17:28 +0200 + py-macaroon-bakery (1.1.3-1) unstable; urgency=medium * New upstream release. diff --git a/macaroonbakery/tests/test_bakery.py b/macaroonbakery/tests/test_bakery.py index 1883987..a6c3e58 100644 --- a/macaroonbakery/tests/test_bakery.py +++ b/macaroonbakery/tests/test_bakery.py @@ -1,6 +1,5 @@ # Copyright 2017 Canonical Ltd. # Licensed under the LGPLv3, see LICENCE file for details. -import os from unittest import TestCase import macaroonbakery.httpbakery as httpbakery @@ -146,16 +145,6 @@ 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': @@ -182,11 +171,6 @@ 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: @@ -255,8 +239,7 @@ class TestBakery(TestCase): def kind(self): return 'unknown' client = httpbakery.Client(interaction_methods=[UnknownInteractor()]) - with HTTMock(first_407_then_200), HTTMock(discharge_401),\ - HTTMock(visit_200): + with HTTMock(first_407_then_200), HTTMock(discharge_401): with self.assertRaises(httpbakery.InteractionError) as exc: requests.get( ID_PATH, diff --git a/macaroonbakery/tests/test_client.py b/macaroonbakery/tests/test_client.py index baafeed..bfc7807 100644 --- a/macaroonbakery/tests/test_client.py +++ b/macaroonbakery/tests/test_client.py @@ -3,7 +3,6 @@ import base64 import datetime import json -import os import threading from unittest import TestCase @@ -28,12 +27,6 @@ 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) |