[Python-modules-commits] [flask-wtf] 03/07: merge patched into master

[Orestis Ioannou]

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

oorestisime-guest pushed a commit to branch master
in repository flask-wtf.

commit 5521d2fca34a918396c1d042db24af525d537478
Merge: f32a6ad af02ee1
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Thu Feb 4 00:29:06 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0002-Disable-test-that-uses-internet.patch     | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_recaptcha.py                            |  4 +--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index c498032,0000000..c9b53b6
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
- 8325a0a234fbca2e73854e498e06837a1ee4d30d
- 8325a0a234fbca2e73854e498e06837a1ee4d30d
++af02ee1fed68e6f68dd409ce7b67c481b458495b
++af02ee1fed68e6f68dd409ce7b67c481b458495b
 +1cd5df15057936b7f0cdecb47744163857753a8b
 +1cd5df15057936b7f0cdecb47744163857753a8b
 +flask-wtf_0.12.orig.tar.gz
 +ae22d907a3ed58bed2df80e09a07e86be27f409b
 +247397
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Disable-test-that-uses-internet.patch
index 0000000,0000000..e78d382
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Disable-test-that-uses-internet.patch
@@@ -1,0 -1,0 +1,31 @@@
++From af02ee1fed68e6f68dd409ce7b67c481b458495b Mon Sep 17 00:00:00 2001
++From: Orestis Ioannou <orestis at oioannou.com>
++Date: Thu, 4 Feb 2016 00:15:37 +0100
++Subject: Disable test that uses internet
++
++---
++ tests/test_recaptcha.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/tests/test_recaptcha.py b/tests/test_recaptcha.py
++index d752e0a..ba43c8f 100644
++--- a/tests/test_recaptcha.py
+++++ b/tests/test_recaptcha.py
++@@ -39,7 +39,7 @@ class TestRecaptcha(TestCase):
++         response = self.client.post('/', data={})
++         assert b'missing' in response.data
++ 
++-    def test_send_recaptcha_request(self):
+++    """def test_send_recaptcha_request(self):
++         response = self.client.post('/', data={
++             'g-recaptcha-response': 'test'
++         })
++@@ -48,7 +48,7 @@ class TestRecaptcha(TestCase):
++         response = self.client.post('/', data=json.dumps({
++             'g-recaptcha-response': 'test'
++         }), content_type='application/json')
++-        assert b'invalid' in response.data
+++        assert b'invalid' in response.data"""
++ 
++     def test_testing(self):
++         self.app.testing = True
diff --cc debian/patches/series
index c9ee63f,0000000..7fd4248
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +doc-index.patch
++0002-Disable-test-that-uses-internet.patch

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