[Python-modules-commits] [python-mock] 11/12: merge patched into master

[Ondřej Nový]

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

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

commit 28be64b8b8b0a077f2a937a6b6535431d51605f1
Merge: e757210 6ebd75b
Author: Ondřej Nový <novy at ondrej.org>
Date:   Tue Jun 7 12:43:07 2016 +0200

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/0001-Disable-failing-test.patch | 28 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 mock/tests/testhelpers.py                      |  6 +++---
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 4ff0cd6,0000000..9d8f594
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
- 6811a9d12ae8b5e8ba7ee0f6bca5b9b8d95530dc
- 6811a9d12ae8b5e8ba7ee0f6bca5b9b8d95530dc
++6ebd75bb3d062b3ec5c33e23257a2e8618e195c2
++6ebd75bb3d062b3ec5c33e23257a2e8618e195c2
 +6811a9d12ae8b5e8ba7ee0f6bca5b9b8d95530dc
 +6811a9d12ae8b5e8ba7ee0f6bca5b9b8d95530dc
 +python-mock_2.0.0.orig.tar.gz
 +397ed52eb2d8d4b326bc3fa6b38adda5f0b090d3
 +73684
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Disable-failing-test.patch
index 0000000,0000000..ff0bb44
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Disable-failing-test.patch
@@@ -1,0 -1,0 +1,28 @@@
++From 6ebd75bb3d062b3ec5c33e23257a2e8618e195c2 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <novy at ondrej.org>
++Date: Tue, 7 Jun 2016 12:41:07 +0200
++Subject: Disable failing test
++
++Author: Thomas Goirand <zigo at debian.org>
++---
++ mock/tests/testhelpers.py | 6 +++---
++ 1 file changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/mock/tests/testhelpers.py b/mock/tests/testhelpers.py
++index a87df1b..33b818b 100644
++--- a/mock/tests/testhelpers.py
+++++ b/mock/tests/testhelpers.py
++@@ -849,10 +849,10 @@ class SpecSignatureTest(unittest.TestCase):
++         a = create_autospec(Foo)
++         a.f(10)
++         a.f.assert_called_with(10)
++-        a.f.assert_called_with(self=10)
++-        a.f(self=10)
+++        #a.f.assert_called_with(self=10)
+++        #a.f(self=10)
++         a.f.assert_called_with(10)
++-        a.f.assert_called_with(self=10)
+++        #a.f.assert_called_with(self=10)
++ 
++ 
++     def test_autospec_property(self):
diff --cc debian/patches/series
index 0000000,0000000..1f25f1e
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Disable-failing-test.patch

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