[Python-modules-commits] [pytest-mock] 05/06: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository pytest-mock.

commit a8b604583b545bff9ec0108b4cc9c105ad8dfc8c
Merge: f3e6ab3 f13872e
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Oct 15 20:56:29 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0001-Update-tests-to-work-with-pytest-3.patch  | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 test_pytest_mock.py                                |  4 +--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 07d97bb,0000000..49f8727
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
- bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
- bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
++f13872e1a5118d1d13b2541988105376e9502527
++f13872e1a5118d1d13b2541988105376e9502527
 +bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
 +bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
 +pytest-mock_1.2.orig.tar.gz
 +179568a82c1107fbfbd799e2887c17ee59dec834
 +11527
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Update-tests-to-work-with-pytest-3.patch
index 0000000,0000000..167c8cd
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Update-tests-to-work-with-pytest-3.patch
@@@ -1,0 -1,0 +1,31 @@@
++From f13872e1a5118d1d13b2541988105376e9502527 Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sat, 15 Oct 2016 20:55:53 +0200
++Subject: Update tests to work with pytest 3
++
++---
++ test_pytest_mock.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/test_pytest_mock.py b/test_pytest_mock.py
++index 1d55295fab4f..f293a3cfe21a 100644
++--- a/test_pytest_mock.py
+++++ b/test_pytest_mock.py
++@@ -176,7 +176,7 @@ class TestMockerStub:
++         stub = mocker.stub(**kwargs)
++         with pytest.raises(AssertionError) as exc_info:
++             stub.assert_called_with()
++-        assert exc_info.value.msg == expected_message
+++        assert str(exc_info.value) == expected_message
++ 
++     def test_failure_message_with_no_name(self, mocker):
++         self.__test_failure_message(mocker)
++@@ -352,7 +352,7 @@ def assert_argument_introspection(left, right):
++         #       test was run by examining sys.argv
++         verbose = any(a.startswith('-v') for a in sys.argv)
++         expected = '\n  '.join(util._compare_eq_iterable(left, right, verbose))
++-        assert expected in e.msg
+++        assert expected in str(e)
++     else:
++         raise AssertionError("DID NOT RAISE")
++ 
diff --cc debian/patches/series
index 0000000,0000000..964b76a
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Update-tests-to-work-with-pytest-3.patch

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