[Python-modules-commits] [python-mockupdb] 02/07: merge patched into master

[Ondrej Novy]

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

onovy pushed a commit to branch master
in repository python-mockupdb.

commit 3884b540b990f4e49f97490f1f0813c679581855
Merge: 5367ef8 eb2252d
Author: Ondřej Nový <onovy at debian.org>
Date:   Tue Jan 16 14:36:04 2018 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Don-t-require-pymongo-for-tests.patch     | 22 ----------------------
 debian/patches/0001-Skip-SSL-tests.patch           | 21 +++++++++++++++++++++
 debian/patches/series                              |  2 +-
 setup.py                                           |  2 +-
 tests/test_mockupdb.py                             |  1 +
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --cc debian/.git-dpm
index 9f156a1,0000000..1227f3c
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
- c7c00506a50764bf3947fa6ce458de7d1c3209f8
- c7c00506a50764bf3947fa6ce458de7d1c3209f8
++eb2252d08951a6c66a64fe7872a375d8a4accef4
++eb2252d08951a6c66a64fe7872a375d8a4accef4
 +d6f07f2f2fdbefd39786177726b936c44e53d050
 +d6f07f2f2fdbefd39786177726b936c44e53d050
 +python-mockupdb_1.2.1.orig.tar.gz
 +0b3ee2d39fb218d42253016e0d3e50a3b3298e1a
 +60530
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Skip-SSL-tests.patch
index 0000000,0000000..35501c4
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Skip-SSL-tests.patch
@@@ -1,0 -1,0 +1,21 @@@
++From eb2252d08951a6c66a64fe7872a375d8a4accef4 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Thu, 10 Nov 2016 22:00:16 +0100
++Subject: Skip SSL tests
++
++---
++ tests/test_mockupdb.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/tests/test_mockupdb.py b/tests/test_mockupdb.py
++index e72ab96..8171179 100755
++--- a/tests/test_mockupdb.py
+++++ b/tests/test_mockupdb.py
++@@ -214,6 +214,7 @@ class TestAutoresponds(unittest.TestCase):
++         self.assertEqual('bar', response['foo'])
++ 
++ 
+++ at unittest.skip("Doesn't work")
++ class TestSSL(unittest.TestCase):
++     def test_ssl_uri(self):
++         server = MockupDB(ssl=True)
diff --cc debian/patches/series
index 238baf6,0000000..f717cc1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 0001-Don-t-require-pymongo-for-tests.patch
++0001-Skip-SSL-tests.patch

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