Fix tests.

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

diff --git a/ChangeLog b/ChangeLog
index 61452e9d8041be72f1bbf11782e95992777a008a..8e5c2c93201e78cd51f50e13858f0d4a8fc85738 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  11 Jan 2014; Mike Gilbert <floppym@gentoo.org> webtest-2.0.11.ebuild:
+  Fix tests.
+
   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.

diff --git a/Manifest b/Manifest
index 095f985dc590a21bc8b47016560ba274cf8844b9..44e2999ee16d658014d0927d40dadecd792e0b36 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -29,7 +29,7 @@ EBUILD webtest-1.4.3-r1.ebuild 1546 SHA256 3c07f108718aced8002886f8f19fb7bd95caf
 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 1774 SHA256 5060655c9fd0fafecdf0703e7a6fc7137ba183297d09f450935f07233f17e6c9 SHA512 0b3ff4853095e7ed3ac632a80608082e7d6bb14646e1be4cbbbea9049b32c98029fd8b278e650a1805e82c32a3a1fc58b1b8aeb6891075f2300fd4d4365e61b9 WHIRLPOOL 3f6652019d03f387595f4c82a4785cbc257e8e9c7ab816401216c9912d26d8eca5286eb7946b2fbafe8a3fa256414ef2a5dd976d6d91dd2c53efcf49f61d131b
+EBUILD webtest-2.0.11.ebuild 1863 SHA256 42e1e93484e603187790f5a82a91bcd1236d87328be67232a0da43f1b48275fa SHA512 f7d25fb8f6cbdb5d04119602463f35c7d388cea4782ad2d6af904ae7da23e72a00ef9e261693a5bac3ebfcab0e862130c950c11337bae052b22c1a6694b226fa WHIRLPOOL 4d2e94ebf87a77239c087cf57f493212956f90f44627db17f8cdef5bb5a1df77bb4e1d129a86c9bb095a77d3fa52c728b11d6d770693a4ded42f69550ae2c4d5
 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
@@ -37,12 +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 9149 SHA256 e336190af1fc186bf7edd2b1b0cefe385e84372eda50559b4ec9ce7ce4370b8e SHA512 f2bd50b9d6c894c0f1a23b66556bbf0f9e68ca1a80e0a76b9755361b1408c09ab3c85b9b62e28b80aab1a233ec5a0d303504047e9fddf25c3c29fc946367b57b WHIRLPOOL bda34cf1e7df72eaa5fc9225977e63d410a32170e9cdf4ce093fa4cf18c0f1a9e51babd9ef5b267fe35a4865654ed5dd6ff26839ef556d3e8d7e6eaca0fa125d
+MISC ChangeLog 9235 SHA256 9aadfa2d4249afa418eec0d17328a181e6357a588afbb113a5a301afe82b2077 SHA512 31456b6be9eff81cc5ab3b4b72026a256dd4c37455d104c8141b6b8d92a0f88f0237536e8c79d55b83ec3885106140a99caf57c3bdb2558e1dfe79526e5c35ed WHIRLPOOL 44d1ff0a063f8f538e2be999b808e6c3b8b5b4d69a8387c4a06e3f345d356ca3d7eca7a64eca9b2d83145a66e3ea4060d18719bd601c746148f4dbc649bfac94
 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
+iF4EAREIAAYFAlLRxnsACgkQC77qH+pIQ6TOzAD9E72QhnPaeN0huwaR2mqulBS+
+XukkMXmUyjwaax2pxaQA/jMuEhxh6hURmE1Dgr395qtrPDRWjGKSdoNNpCmG5hMZ
+=AH6H
 -----END PGP SIGNATURE-----

diff --git a/webtest-2.0.11.ebuild b/webtest-2.0.11.ebuild
index b2053a334b75a3c558edd94d8b20aaad1bb5aa42..c28b7db3ca55a8c4c790da6e5f764e98855ec9b9 100644 (file)
--- a/webtest-2.0.11.ebuild
+++ b/webtest-2.0.11.ebuild
@@ -4,8 +4,6 @@
 
 EAPI=5
 
-RESTRICT="test"
-
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
@@ -35,12 +33,16 @@ DEPEND="${RDEPEND}
        doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
        test? ( dev-python/nose[${PYTHON_USEDEP}]
                dev-python/pyquery[${PYTHON_USEDEP}]
+               dev-python/pastedeploy[${PYTHON_USEDEP}]
                dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-               dev-python/pyquery[${PYTHON_USEDEP}]
-               virtual/python-unittest2[${PYTHON_USEDEP}] )"
+               virtual/python-unittest2[${PYTHON_USEDEP}]
+       )"
 
 S="${WORKDIR}/${MY_P}"
 
+# Makes testing easier; otherwise we get errors from pkg_resources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
 python_compile_all() {
        if use doc; then
                sphinx-build docs html || die
@@ -53,7 +55,7 @@ src_test() {
 
 python_test() {
        # Tests raise ImportErrors with our default PYTHONPATH.
-       unset PYTHONPATH
+       local -x PYTHONPATH=
        nosetests || die "Tests fail with ${EPYTHON}"
 }