[Python-modules-commits] [pytest] 02/09: 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 pytest.

commit 1464bb16a4fffc4b32e983b6fa8d3a7996ea16e8
Merge: a5a99e5 0b40a2c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Jul 13 13:44:57 2017 +0200

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/0003-Skip-test-under-PyPy.patch | 22 ++++++++++++++++++++++
 debian/patches/series                          |  1 +
 testing/test_warnings.py                       |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 99508da,0000000..a003e10
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
- c3a3e980c77574d8371f90216e8010a5348c75f1
- c3a3e980c77574d8371f90216e8010a5348c75f1
++0b40a2c804822083e5552526e13b5acccd8f8bb0
++0b40a2c804822083e5552526e13b5acccd8f8bb0
 +1f3ae240b868a1fffc4506451270d91075308281
 +1f3ae240b868a1fffc4506451270d91075308281
 +pytest_3.1.3.orig.tar.gz
 +cd4071d489f61e7f5387e90d5f0eaef61a5f45d4
 +768801
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Skip-test-under-PyPy.patch
index 0000000,0000000..6660e9a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Skip-test-under-PyPy.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 0b40a2c804822083e5552526e13b5acccd8f8bb0 Mon Sep 17 00:00:00 2001
++From: Sebastian Ramacher <sramacher at debian.org>
++Date: Thu, 13 Jul 2017 13:44:54 +0200
++Subject: Skip test under PyPy
++
++---
++ testing/test_warnings.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/testing/test_warnings.py b/testing/test_warnings.py
++index 69bda11..9e23be8 100644
++--- a/testing/test_warnings.py
+++++ b/testing/test_warnings.py
++@@ -138,7 +138,7 @@ def test_unicode(testdir, pyfile_with_warnings):
++     ])
++ 
++ 
++- at pytest.mark.skipif(sys.version_info >= (3, 0),
+++ at pytest.mark.skipif(sys.version_info >= (3, 0) or  '__pypy__' in sys.builtin_module_names,
++                     reason='warnings message is broken as it is not str instance')
++ def test_py2_unicode(testdir, pyfile_with_warnings):
++     testdir.makepyfile('''
diff --cc debian/patches/series
index 30a1f91,0000000..88f440f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +remove_google_js
 +intersphinx.patch
++0003-Skip-test-under-PyPy.patch

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