Fix tests on pypy, remove test that accesses the network (bug #339252).

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

4 files changed, 46 insertions, 12 deletions

diff --git a/dev-python/paste/ChangeLog b/dev-python/paste/ChangeLog
index 95a2a873646d..0e32b8680135 100644
--- a/dev-python/paste/ChangeLog
+++ b/dev-python/paste/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/paste
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/ChangeLog,v 1.16 2011/05/24 21:02:58 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/ChangeLog,v 1.17 2012/05/16 21:35:37 marienz Exp $
+
+  16 May 2012; Marien Zwart <marienz@gentoo.org>
+  +files/paste-1.7.5.1-fix-tests-for-pypy.patch, paste-1.7.5.1.ebuild:
+  Fix tests on pypy, remove test that accesses the network (bug #339252).
 
   24 May 2011; Markus Meier <maekke@gentoo.org> paste-1.7.5.1.ebuild:
   x86 stable, bug #365537
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 6ee5fad4deab..a303c954b166 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX paste-1.7.5.1-fix-tests-for-pypy.patch 927 RMD160 9666c6288a979110edf1f3b049d9e525064e2a2d SHA1 164e95389e85e7a3bb6ffa4ca7fc50f295588f42 SHA256 04b5ce99cca6dba60656410ffb21f9f382bb9e04d1e8c64bec12d3bb9ac39cd6
 DIST Paste-1.7.5.1.tar.gz 523304 RMD160 554304c4a45b208a77281dff3705cee5f9d6b2be SHA1 11d3c5a2dc52c5e725139a9334574291a0f9d04f SHA256 11645842ba8ec986ae8cfbe4c6cacff5c35f0f4527abf4f5581ae8b4ad49c0b6
-EBUILD paste-1.7.5.1.ebuild 1676 RMD160 607afa6d628d306dee2616e83471c8ec2d19a802 SHA1 69b9ad84a066dc42e385e53e43802f04c5d59142 SHA256 62c9985018efe5ed97b4a700e5844608d199cddd3cf592fd0ef94c9dd6d26861
-MISC ChangeLog 2397 RMD160 06bd8a5702cb2d4a673479ec8a647d26286e6cfd SHA1 582598f4765d0dbb7422c2bff3d438c6f766878e SHA256 33c0c8a0dac5962605fd53a01f7b9d011a7fa43a81c9165d6a2cd00c232b7fcc
+EBUILD paste-1.7.5.1.ebuild 1816 RMD160 a5eddd8b01b6e9f75f559c4e9a5b16fb6586910a SHA1 84ee31114c37ac1c127fbc6cafa4c9801b4dec5a SHA256 7a1a341fe403b72d0b878e87028c7d66df3d92b7bfd1586f6f9975eac62aec03
+MISC ChangeLog 2593 RMD160 c1952d94346c8b5d7a8317cfc5ffe8427fba5091 SHA1 79d6b714352f757bfb26d1bcd928893a305e728f SHA256 7fb582f125f9dbd0afcaf935cf4ae6bf1262017fa100a5bc692596c302d287b3
 MISC metadata.xml 708 RMD160 0a4f3b803cefedf5d83c76dfa64947d0d211083d SHA1 1bcb96b943b34637fc8e4bbeafb591a625d8e4ae SHA256 4a5ebb764c238e4cb64756c5619f9d383b913d6a3873e660bbc601c31ed3eaae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk93SlYACgkQuUQtlDBCeQKaRQCdFiUiAGlSiV743cvTi3VJnJ+m
-AVsAnicRBYxiYdQN74lFQaNsUjKSsvc7
-=Vex2
+iF4EAREIAAYFAk+0HacACgkQpnr2roL0g0lqgAEAg5pa+xwAmJbvoSq0pEOiIh1g
+hSwYGf+tWOxoowXCkIcA/RpQz/M0yadInMnnUGEbb8ztTHBYMkmi4v2EELhTamgY
+=XNY6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/paste/files/paste-1.7.5.1-fix-tests-for-pypy.patch b/dev-python/paste/files/paste-1.7.5.1-fix-tests-for-pypy.patch
new file mode 100644
index 000000000000..b5e9430c3bb9
--- /dev/null
+++ b/dev-python/paste/files/paste-1.7.5.1-fix-tests-for-pypy.patch
@@ -0,0 +1,24 @@
+Ignore the exception detail for two exceptions that are slightly
+different on pypy.
+
+diff -r 7f90a96378ed tests/test_template.txt
+--- a/tests/test_template.txt	Mon Mar 05 21:14:08 2012 +0100
++++ b/tests/test_template.txt	Wed May 16 23:29:46 2012 +0200
+@@ -6,7 +6,7 @@
+     'Hi Ian'
+     >>> Template('Hi {{repr(name)}}').substitute(name='Ian')
+     "Hi 'Ian'"
+-    >>> Template('Hi {{name+1}}').substitute(name='Ian')
++    >>> Template('Hi {{name+1}}').substitute(name='Ian') #doctest: +IGNORE_EXCEPTION_DETAIL
+     Traceback (most recent call last):
+         ...
+     TypeError: cannot concatenate 'str' and 'int' objects at line 1 column 6
+@@ -125,7 +125,7 @@
+     >>> sub('{{default x=1}}{{x}}')
+     '1'
+     >>> # The normal case:
+-    >>> sub('{{x}}')
++    >>> sub('{{x}}') #doctest: +IGNORE_EXCEPTION_DETAIL
+     Traceback (most recent call last):
+         ...
+     NameError: name 'x' is not defined at line 1 column 3
diff --git a/dev-python/paste/paste-1.7.5.1.ebuild b/dev-python/paste/paste-1.7.5.1.ebuild
index 8ea8adc8fb4d..a652fbdd02c9 100644
--- a/dev-python/paste/paste-1.7.5.1.ebuild
+++ b/dev-python/paste/paste-1.7.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-1.7.5.1.ebuild,v 1.4 2011/05/24 21:02:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-1.7.5.1.ebuild,v 1.5 2012/05/16 21:35:37 marienz Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 DISTUTILS_SRC_TEST="nosetests"
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN="Paste"
 MY_P="${MY_PN}-${PV}"
@@ -40,6 +40,11 @@ src_prepare() {
 		-e "s/test_deep/_&/" \
 		-e "s/test_static_parser/_&/" \
 		-i tests/test_urlparser.py || die "sed failed"
+
+	# Remove a test that runs against the paste website.
+	rm tests/test_proxy.py
+
+	epatch "${FILESDIR}/${P}-fix-tests-for-pypy.patch"
 }
 
 src_compile() {