Fix tests in 1.4.3-r1, and port changes to 2.0.11. Bug 484222.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

diff --git a/ChangeLog b/ChangeLog
index c975fa91494cf88cbf2f6a8e43cf6c8fe505180e..61452e9d8041be72f1bbf11782e95992777a008a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  11 Jan 2014; Mike Gilbert <floppym@gentoo.org> webtest-1.4.3-r1.ebuild,
+  webtest-2.0.11.ebuild:
+  Fix tests in 1.4.3-r1, and port changes to 2.0.11. Bug 484222.
+
 *webtest-2.0.11 (08 Jan 2014)
 
   08 Jan 2014; Patrick Lauer <patrick@gentoo.org> +webtest-2.0.11.ebuild:

diff --git a/Manifest b/Manifest
index e213bffa10bbc8f83fccdb42c121467caf089d31..095f985dc590a21bc8b47016560ba274cf8844b9 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX webtest-1.3-doctest-ellipsis.patch 1116 SHA256 a6e64a000ad6745b12cb8ab6061b09ce692f3efcf061851cc1bc0e4eb9d2e9ed SHA512 d1a8c2f7446862327e5a23a34fba81a737526d66e44c25753066aaf7f5145e2676b612ee7d9541d756683f96395d2805df90066038595365b34320e357544149 WHIRLPOOL d64d9d1edddf578f19d1aee3f8b3bad501b4a88dc2f5e06290b63a2189c7e3fc16968ba2185c7ca21920e89277fb905a982bfa897b19f59eb498cef1442fcd54
 AUX webtest-1.3.4-index_fixt.patch 325 SHA256 358939de8a5f188262c8ba337c122a390b408d2b56ae1f4c7c79875945ad6bc1 SHA512 fcf73ed79bc2028b05f84186592b8fc5bba385bef01d61a918757f24944a275c1a0bb189bccd2541b27fee160280bf51ba0982e28b62493d4f4522f4e6e52d16 WHIRLPOOL 205f68ffa89bcc037bee4b7d148acf5f51d4f0f760b0f4a062eed8cf9a85f50d36becafdcc77e02435b2f254cfddf3156faa0743a0dd4cc59aa0e8a81c56c4f0
 DIST WebTest-1.2.3.tar.gz 49571 SHA256 5e1cdb914a889ee035daa610e9858c1a33fec481cbd7a7df45b537954cbb513b SHA512 ab62d4429ac59de5c32220e9d927c79abe60f5e10c42f4e34bdbbf02d9aa0a7b286a214cee74ed599f2d9790185bf2e77d25c1ec98b091aae29250cbf133930a WHIRLPOOL dfa423bbeba6ab4f8cc98233ab8c97ea68e4de031e484461c713f001ef13e537c9b732542af06cc60846e12c3949ba03b0a9e342281e1556a55df9be5b6efbc8
@@ -22,11 +25,11 @@ EBUILD webtest-1.3.3.ebuild 1529 SHA256 e30d619cc1594f2dfe8d4ee1a22c48f31a9b4ce5
 EBUILD webtest-1.3.4.ebuild 1476 SHA256 d9198f16d7d35c6fe7a648ecf113b70401cf39e49ca36a258debd76a4d04cd63 SHA512 cc2bc67826f08d0062c0a6cda2b6995eeee6ad0f44643ff1ed35711799dbd636e13aa698ed358bfb1ee574be8289f95174b9c6a2e1cb7bedf9f2ab3df617bbde WHIRLPOOL 9d4c9d00b8fc35fda2586e15be83b92f95a087eabb82bf16c3f0081dae5cbc8c09ef87d83d21ff9f7004b83ac6daafc8a406872fc8506a52b13604201edd92dc
 EBUILD webtest-1.3.ebuild 1466 SHA256 054aa2d2cd4ffcb3d353135ad23696c476bfe433e5cb2ec83bda3c1fa4b9c635 SHA512 2c0fb6429cddbc93e561ace44989e21de9e83c23fa5fcd1648d96cac185611311bee9e57f357b5d9870b68efc1f619f31cb99ce2c9c73fb03e592e5d3b19c0b0 WHIRLPOOL 5ceca6d12886f38909dbe8e4b8f3bd54d9fac07d738323fe7c95736a605be996cd39137d9e88701b15ea982c161b51671231cc3dc9f96e839df05e98c456557f
 EBUILD webtest-1.4.0.ebuild 1383 SHA256 0aa301dcec87eacd8e23c974ad1e3451550a944a34b4a6f3c8609127df84ecb5 SHA512 6df960b0a19844bc81f10533adb5f2a443d51dd8a87f4fbbf134a337864a5c5642a8c7b09370d2ebf6078e0d00187730a49a8faabe20d008b315458e0a747fd8 WHIRLPOOL c09f77cea032d8843753c0695ef35aaec0f36d7eb087c3afb3546448bb5285da9f1cddf2a035fed3da228f04537badaa54e81f5b76f46c9ea2b072bbea27b60d
-EBUILD webtest-1.4.3-r1.ebuild 1354 SHA256 84328f04984dc47ba81b231be71c30e986f625d75cfb4572a332abda0385a36a SHA512 ee1ad629df754d34d1c76157d2998f6a9708ed7c225b4182ce99e03ba7fe4048f3ebb38148f0e18b963babb7278b3c4aa7b79412325bd9052927f55ee9588244 WHIRLPOOL 7bd24ac1e624a812cf740ad795e0f54fff3fc85840961e8c691ba99e63b0de2c98c774fce8adab073649320b393d3981e58de6298f991ccabc2cc9b4c155ebe7
+EBUILD webtest-1.4.3-r1.ebuild 1546 SHA256 3c07f108718aced8002886f8f19fb7bd95cafcaf9cf00bd507a5a418f548b684 SHA512 1a8cc22989180957253f0710eb2db8ee16ec694a83553a0890f77097073e5718b65b1852d2aee842a805a33bf1b3797b9beb3d710c4d232e7b59c3a652cc793d WHIRLPOOL 767ef86d758a9be55a5b3cddf1a79009d47692e4a4bb387a931813968939355f774fcd725e34224b6d7b232d1e64df1e474a485b536ad9f1da8e1d5da7de6818
 EBUILD webtest-1.4.3.ebuild 1384 SHA256 ee764eddae519a886ef53be93deccfbbc9664dd3f3d26893aa777cf0a1fdf844 SHA512 2e67653e129859628303a5962080f49a21ab4f2fd6e35dd585106992c7bcc5d4ecc51d674d086972c02b82e8fab23e111ec7bcc9c901c84122b32042accb6ff4 WHIRLPOOL 615b2cdcd24086808cfa961efa2d79549f7e645a5d8db3dcff30e04715817b7079660883872add50052815273be2cd82ab47fba4fce5093b1ed958fddf187167
 EBUILD webtest-2.0.1.ebuild 1339 SHA256 8940393a49957087f34dc4aea5dcb7d05a0f8b4c1fc5e82d9718eb8cc4385329 SHA512 1a24b998762d9d6c49aab1575cfbe169ae6e80bc5e18184b26c217146dffecc1dae75351f8aa8451c58369151b85ee3866c60f76eb80ec7a4c66a78633d8ded0 WHIRLPOOL b1e321fd3df79bcfe560c95e06a817ee15b677e00c997db208b0614b31476b1b30920aa828785fd896e286dcc3d3476fc5cf5e807150b4d54f452a79f62c5395
 EBUILD webtest-2.0.10.ebuild 1598 SHA256 ead7417d470db9795bb4212951f234a4709c2b8c4e359c87003bfb04f1067d14 SHA512 19a4d87e9cd95795702a5b6216df80e2d934aac9ded6e624fb1103370faf76dd5a26b1909242924759929d94323733ae343ee5481058ea28d27bac29bf29a9ce WHIRLPOOL 5c120124c76fe72979c77a2c749be96d230222bd4de0ae8523231f5e42477fb07f0f13b52adb0320d1351f51134cb0afc2ee34a8f93183c508de6f9865365cbb
-EBUILD webtest-2.0.11.ebuild 1598 SHA256 66da35b480dd70d4f7605212e98dad20770fff5882920b47c8997412512c84df SHA512 3e4a045816e44e82254494850c03cd1e9db2eb12251b804cdb6faa9547548b733c750095617a6cb154a9a3ece21a43eb1e3d249bc70625195c586d94e0e07aa7 WHIRLPOOL d3ae4fc0b4808d450f22e90c9ac2abba7dc7cd4c84c6448b723ff5ba91e91d46b893617d5bea41727cff57d31282863a8d02917a2d1af888ef8d13c4aae2c7fd
+EBUILD webtest-2.0.11.ebuild 1774 SHA256 5060655c9fd0fafecdf0703e7a6fc7137ba183297d09f450935f07233f17e6c9 SHA512 0b3ff4853095e7ed3ac632a80608082e7d6bb14646e1be4cbbbea9049b32c98029fd8b278e650a1805e82c32a3a1fc58b1b8aeb6891075f2300fd4d4365e61b9 WHIRLPOOL 3f6652019d03f387595f4c82a4785cbc257e8e9c7ab816401216c9912d26d8eca5286eb7946b2fbafe8a3fa256414ef2a5dd976d6d91dd2c53efcf49f61d131b
 EBUILD webtest-2.0.2.ebuild 1462 SHA256 1ad47d5df4f0a60177b73c231e756127950f7e51b5e5a14f47ff332818958924 SHA512 cdad024e565a66014d5694bfb8375d080154ab9e78ad557bc453d0a21c6d0ab08804eaec2c526d071d08e595dbe05420a4489bbb7fb5244d1458e39bcbf608d5 WHIRLPOOL cd35c876bb9cf30a683644fb8c350ebb16aadcee032e6956ea4eb594c9c7ebd55483b5940c810e1d717eba5357a452b50ae721a3f8f8ee85567c326407bf25b3
 EBUILD webtest-2.0.3.ebuild 1462 SHA256 cbd04001d2503a9d38c352afe4f35b0eb26430ccee3b2ef0a3523a91a1696793 SHA512 d33e801ae2350db651dca8930957c58d2f1cff4696ab4b9bcc8b928dc8202be3a72902816d25bb3c8d820f8cbcb4720065dfe83bf22d4a1b15afd16f13596ad2 WHIRLPOOL f8cbbceb36fb4495b89108a9f00c184ee21434d7f37b8be8cb8e369ea0e9995854b673a9e9d4254d2b7ce43328e203adb1cdf02c1f9968644ccf2072375cfb02
 EBUILD webtest-2.0.4.ebuild 1462 SHA256 f0d9ffd39fb2fd16054f9b3b2afa46d8538b1770515b7bf6d83ac8423f878ced SHA512 c7c07a716546714ce10b402b6269ce76e1c3f946a80c248a3bec9d8a4da83aebb3378cf5d529b862c1a8c12bb5054f5307b898e798d9ea50dcf67b8e5571aa32 WHIRLPOOL 3d4948c159190e8065a02912b8fee659c5f416f91f28596105fcee9f03e1ecfecd9df3e50cb99a424ec87988703403f95c9bfda92b611a5b63b33300e827a60d
@@ -34,5 +37,12 @@ EBUILD webtest-2.0.5.ebuild 1462 SHA256 8641cc100d7341961fbb47bedfb96e1824d43fbd
 EBUILD webtest-2.0.6.ebuild 1462 SHA256 252b186b153b120d18cc0ca2901e2169e5c6f9af036be3944348d4b00403b9d5 SHA512 24a1c57a786a3ea8de862a3fe5ea5176bdea20846ec791b71b0828e65343d975a430422eea01c93e7f0ef50488616bcf206fe8b5aca025e04340d569339e0512 WHIRLPOOL c95bf52d684f8a65df4783e1eacbb660e382d1d1cf4e17e9adb6d506e6d8834f53d7fe74be94403fa4f0231652ef49d5a33415c6e8442b7ff2237c23d739df32
 EBUILD webtest-2.0.7-r1.ebuild 1600 SHA256 d7cd999123ceee680f1c9c92379db5508b9b9b1da18d481432c5c8941917b953 SHA512 2f7dbc7860c65629ae84dccd9a859e6cb01b73a4adff5a8f02084833020e2c67951daffb47102990a27a90e20c1898123e6372a65b8559497f1e76326cc54a89 WHIRLPOOL 7346cb2a99e402d87fa885bdce9ac6fae71109f4f8182f08b619759a0970146b01beecd96e40e8e81dd9743f55281200c71a92e8104932b62117a030ac6f48c6
 EBUILD webtest-2.0.9.ebuild 1597 SHA256 fae80824def02667e3bf38d869727f9acc1512a0d5993c438226b0b6ea79617a SHA512 e56ae7917a5545e624a5b5c673266394c3f6af3e1ab60847b14e9afedb2f7dad1e6d3c606e483341fd755568c84bcb7e9f59c5470e51c41f9524b15a00531701 WHIRLPOOL 7eb5fb28230e941892245a455a177a0cc3d6d9967c859d85124c5f24503639146944b274014e808eba09fa0136b3646c7b549fd36dbd59892958c2b9405c64a1
-MISC ChangeLog 8984 SHA256 f5d801a5b3fb0cee9b05fe5583177909cd70147b4660da2633b8af4d02725718 SHA512 146fde787203a23e15b939bd0ad2bcc5a0a76780c70a850326cc9e1f98f30493f5bfb1e10537e637dc6c3d3338b5a2e28889133c900567d2bd33db524a081155 WHIRLPOOL 831359222a9e47748af52e85abe364536acd408ef7c1151ac0fc4f916b22721dd7f0150509af82ec39b87aa50ebdd8418f7fbd0b7b28e936e3577badd1962f32
+MISC ChangeLog 9149 SHA256 e336190af1fc186bf7edd2b1b0cefe385e84372eda50559b4ec9ce7ce4370b8e SHA512 f2bd50b9d6c894c0f1a23b66556bbf0f9e68ca1a80e0a76b9755361b1408c09ab3c85b9b62e28b80aab1a233ec5a0d303504047e9fddf25c3c29fc946367b57b WHIRLPOOL bda34cf1e7df72eaa5fc9225977e63d410a32170e9cdf4ce093fa4cf18c0f1a9e51babd9ef5b267fe35a4865654ed5dd6ff26839ef556d3e8d7e6eaca0fa125d
 MISC metadata.xml 230 SHA256 5b66abf10f340308f2e1a4f3a275e110a2a52842e683bd2a1eb84d387a5ea163 SHA512 d55a5077c6ece4bb2da3d869023175b49a9ff6f20aed4696ede22e729ef823c4d162911ed3fd85fe29973600813624e4d5d5d6d2a9c82395abe0090f76e673dd WHIRLPOOL 726f7c4456a23191c433f978002121826d71729ad750a862a80229b828ebe6d2d2410ad2a87229380608d9880e38c21c441a778963d38c7ad3a646c66f2eed35
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlLRwGQACgkQC77qH+pIQ6QQQQEAytwhHbgHCidZZlpn3uJALDKM
+/n5G/u1io2ejoGF7ltEA/Aypler8RRzYD+BYa7Wcp7qo5qN2yALDzPnXjsh0F2qc
+=oxye
+-----END PGP SIGNATURE-----

diff --git a/webtest-1.4.3-r1.ebuild b/webtest-1.4.3-r1.ebuild
index a997bffcdcdf4fe743eecede5051eddb97ba3c7e..4f1dc26b8bdc13720f474798da09920ce01a583f 100644 (file)
--- a/webtest-1.4.3-r1.ebuild
+++ b/webtest-1.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header$
 
@@ -27,7 +27,8 @@ DEPEND="${RDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]
        doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
        test? ( dev-python/nose[${PYTHON_USEDEP}]
-               dev-python/pyquery[${PYTHON_USEDEP}] )"
+               dev-python/pyquery[${PYTHON_USEDEP}]
+               virtual/python-unittest2[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,7 +38,13 @@ python_compile_all() {
        fi
 }
 
+src_test() {
+       DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
 python_test() {
+       # Tests raise ImportErrors with our default PYTHONPATH.
+       unset PYTHONPATH
        nosetests || die "Tests fail with ${EPYTHON}"
 }
 

diff --git a/webtest-2.0.11.ebuild b/webtest-2.0.11.ebuild
index 69b84d283427ecba76cfa517fdb1cd5971b9ace3..b2053a334b75a3c558edd94d8b20aaad1bb5aa42 100644 (file)
--- a/webtest-2.0.11.ebuild
+++ b/webtest-2.0.11.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=5
 
-# sigh.
 RESTRICT="test"
 
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -37,8 +36,8 @@ DEPEND="${RDEPEND}
        test? ( dev-python/nose[${PYTHON_USEDEP}]
                dev-python/pyquery[${PYTHON_USEDEP}]
                dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-               dev-python/paste
-               dev-python/pastedeploy )"
+               dev-python/pyquery[${PYTHON_USEDEP}]
+               virtual/python-unittest2[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -48,7 +47,13 @@ python_compile_all() {
        fi
 }
 
+src_test() {
+       DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
 python_test() {
+       # Tests raise ImportErrors with our default PYTHONPATH.
+       unset PYTHONPATH
        nosetests || die "Tests fail with ${EPYTHON}"
 }