[Python-modules-commits] [musicbrainzngs] 03/04: merge patched into master

[Sebastian Ramacher]

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

sramacher pushed a commit to branch master
in repository musicbrainzngs.

commit d87fdfe00fd8eca47955a896334d72dc4aa9ad17
Merge: b7ab342 1c4a97b
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Tue Dec 20 20:15:01 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...seragent-and-do-auth-in-test_submit-setup.patch | 38 ++++++++++++++++++++++
 ...04-Disable-rate-limiting-in-test_requests.patch | 26 +++++++++++++++
 debian/patches/series                              |  2 ++
 test/test_requests.py                              |  5 +++
 test/test_submit.py                                | 13 ++++++++
 6 files changed, 86 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 3664d36,0000000..2581c09
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 7850b7f863ac5bf387ca8abf898961ca0982de07
- 7850b7f863ac5bf387ca8abf898961ca0982de07
++1c4a97b30b3d3138e14680426fbfba3bac6ad635
++1c4a97b30b3d3138e14680426fbfba3bac6ad635
 +44b5f31309d1bffd4014885d7367b1972f9e44fd
 +44b5f31309d1bffd4014885d7367b1972f9e44fd
 +musicbrainzngs_0.6.orig.tar.gz
 +b850f227d9e63678fc00eb5097dcacbc2dd465d4
 +111052
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Set-useragent-and-do-auth-in-test_submit-setup.patch
index 0000000,0000000..538a6f9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Set-useragent-and-do-auth-in-test_submit-setup.patch
@@@ -1,0 -1,0 +1,38 @@@
++From 8277169b8b3ddc4b38f816e5390bf5a1da0a0b01 Mon Sep 17 00:00:00 2001
++From: Alastair Porter <alastair at porter.net.nz>
++Date: Fri, 2 Dec 2016 22:15:49 +0100
++Subject: Set useragent and do auth in test_submit setup
++
++These tests worked when run in the same context as
++other tests, but when run independently would fail.
++Fixes #211
++
++Signed-off-by: Alastair Porter <alastair at porter.net.nz>
++---
++ test/test_submit.py | 13 +++++++++++++
++ 1 file changed, 13 insertions(+)
++
++diff --git a/test/test_submit.py b/test/test_submit.py
++index bce5362..2538a6b 100644
++--- a/test/test_submit.py
+++++ b/test/test_submit.py
++@@ -8,6 +8,19 @@ from musicbrainzngs import musicbrainz
++ from test import _common
++ 
++ class SubmitTest(unittest.TestCase):
+++
+++    def setUp(self):
+++        self.orig_opener = musicbrainzngs.compat.build_opener
+++        musicbrainz.set_useragent("test_client", "1.0")
+++        musicbrainz.auth("user", "password")
+++
+++    def tearDown(self):
+++        musicbrainzngs.compat.build_opener = self.orig_opener
+++        musicbrainz._useragent = ""
+++        musicbrainz._client = ""
+++        musicbrainz.user = ""
+++        musicbrainz.password = ""
+++
++     def test_submit_tags(self):
++         self.opener = _common.FakeOpener("<response/>")
++         musicbrainzngs.compat.build_opener = lambda *args: self.opener
diff --cc debian/patches/0004-Disable-rate-limiting-in-test_requests.patch
index 0000000,0000000..826d9ba
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Disable-rate-limiting-in-test_requests.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 1c4a97b30b3d3138e14680426fbfba3bac6ad635 Mon Sep 17 00:00:00 2001
++From: Alastair Porter <alastair at porter.net.nz>
++Date: Fri, 2 Dec 2016 22:17:56 +0100
++Subject: Disable rate limiting in test_requests
++
++Signed-off-by: Alastair Porter <alastair at porter.net.nz>
++---
++ test/test_requests.py | 5 +++++
++ 1 file changed, 5 insertions(+)
++
++diff --git a/test/test_requests.py b/test/test_requests.py
++index 298a24d..dd474f9 100644
++--- a/test/test_requests.py
+++++ b/test/test_requests.py
++@@ -14,6 +14,11 @@ class ArgumentTest(unittest.TestCase):
++     def setUp(self):
++         self.opener = _common.FakeOpener("<response/>")
++         musicbrainzngs.compat.build_opener = lambda *args: self.opener
+++        self.orig_do_rate_limit = musicbrainz.do_rate_limit
+++        musicbrainz.do_rate_limit = False
+++
+++    def tearDown(self):
+++        musicbrainz.do_rate_limit = self.orig_do_rate_limit
++ 
++     def test_no_client(self):
++         musicbrainzngs.set_useragent("testapp", "0.1", "test at example.org")
diff --cc debian/patches/series
index 662f2fa,0000000..ef583b9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,4 @@@
 +use_local_intersphinx_links
 +0002-Open-test-XML-as-binary.patch
++0003-Set-useragent-and-do-auth-in-test_submit-setup.patch
++0004-Disable-rate-limiting-in-test_requests.patch

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