Remove non-deterministic doctest, reported by maekke.

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

diff --git a/ChangeLog b/ChangeLog
index 8e5c2c93201e78cd51f50e13858f0d4a8fc85738..ff458d83a523a95fcf30121bc6e80ac453212e52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  18 Jan 2014; Mike Gilbert <floppym@gentoo.org>
+  +files/webtest-1.4.3-doctest.patch, webtest-1.4.3-r1.ebuild:
+  Remove non-deterministic doctest, reported by maekke.
+
   11 Jan 2014; Mike Gilbert <floppym@gentoo.org> webtest-2.0.11.ebuild:
   Fix tests.
 

diff --git a/Manifest b/Manifest
index 44e2999ee16d658014d0927d40dadecd792e0b36..8405470bc3fe26bca1e15798dce22a2fcceaa519 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -3,6 +3,7 @@ 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
+AUX webtest-1.4.3-doctest.patch 588 SHA256 13ada2315d4dce7a43d5364b73e923bbe85b56fe065d0f20e0893f7fdf5e6b95 SHA512 4479d86f15051f43a6d2d13f5e119446d2d8178efd5394335724260ba3d2a60817877976e4c62454f173e1c0052341f8aea2d49ce829059668295bdd76b204fb WHIRLPOOL 5493ca37b234850ec7800e0ad80ac6df7a68d030b4aa0d9d8cd3f031866ad0bb32d84778c4107e8e933eeded5c169c8ba8c19fda783b7f6fe5b74aa83959802c
 DIST WebTest-1.2.3.tar.gz 49571 SHA256 5e1cdb914a889ee035daa610e9858c1a33fec481cbd7a7df45b537954cbb513b SHA512 ab62d4429ac59de5c32220e9d927c79abe60f5e10c42f4e34bdbbf02d9aa0a7b286a214cee74ed599f2d9790185bf2e77d25c1ec98b091aae29250cbf133930a WHIRLPOOL dfa423bbeba6ab4f8cc98233ab8c97ea68e4de031e484461c713f001ef13e537c9b732542af06cc60846e12c3949ba03b0a9e342281e1556a55df9be5b6efbc8
 DIST WebTest-1.3.3.tar.gz 77709 SHA256 018897fd56c1f96396282ac36d32f5c7862eb07e3965765f0e86ca092ecd42a0 SHA512 879bb26302d074aba8b5c5534ff52180db3c7bcf57c08e6f20814a2e7626da8a9c37565558e2c151aa6ca2dbcfa5166a659ddb85d99e1e8f632da0a0cb07dba5 WHIRLPOOL e54a19dfe18a17617866472674246d12f23ed139a686cc1f83f1454c1478d4d1046b48b2fcf49fdd944d5de91c91423517456ff981cb726481837c9765aa65dd
 DIST WebTest-1.3.4.tar.gz 78557 SHA256 f8915f0da91ad47f84e8a7d49936263fb4c5fdd1fb2737e1a7553b2fe52992f1 SHA512 07366b3c4219c6a0d59c9178fe47d164d22e618bf0bd8b05af17a05c8ece28d253c629dcf15374554b93148ded545146a56ca3fc0889605316708e0924869bf3 WHIRLPOOL 39ea4f6a3afa52e533223d6c60368100e5dbc86c397e292d5bcbcf832f9cc66cee7b491a68f336dadeb1ccbf3cf36181d23bb8584772978e834daecb22293cdc
@@ -25,7 +26,7 @@ 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 1546 SHA256 3c07f108718aced8002886f8f19fb7bd95cafcaf9cf00bd507a5a418f548b684 SHA512 1a8cc22989180957253f0710eb2db8ee16ec694a83553a0890f77097073e5718b65b1852d2aee842a805a33bf1b3797b9beb3d710c4d232e7b59c3a652cc793d WHIRLPOOL 767ef86d758a9be55a5b3cddf1a79009d47692e4a4bb387a931813968939355f774fcd725e34224b6d7b232d1e64df1e474a485b536ad9f1da8e1d5da7de6818
+EBUILD webtest-1.4.3-r1.ebuild 1600 SHA256 7109f2312b883512190f78a05b927d174ea68df0049406905a21f97d8715ae0f SHA512 9b3fe72683b50c5678f5b1c406149e411890cf29dd2452f18333f1a0f1bda131e87a46dee5de76ad06357635e5f731f1613beb0ff1282764e39bd31cd7d463e4 WHIRLPOOL ed74019b0874e7f7ed0f2c3d05897eb32eb5ee19dd6ec95935eaa04daed23419fa0d312b6c870ca57e7f4c4b02dcd5093fa2263a71d3136d3ac606e1d9972d5b
 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
@@ -37,12 +38,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 9235 SHA256 9aadfa2d4249afa418eec0d17328a181e6357a588afbb113a5a301afe82b2077 SHA512 31456b6be9eff81cc5ab3b4b72026a256dd4c37455d104c8141b6b8d92a0f88f0237536e8c79d55b83ec3885106140a99caf57c3bdb2558e1dfe79526e5c35ed WHIRLPOOL 44d1ff0a063f8f538e2be999b808e6c3b8b5b4d69a8387c4a06e3f345d356ca3d7eca7a64eca9b2d83145a66e3ea4060d18719bd601c746148f4dbc649bfac94
+MISC ChangeLog 9404 SHA256 e23a7d285bd89f0d84f013142d783382e90f24b00c4b663c39b37f5e5d3e9be2 SHA512 0cddcb6ba60cdd1d8cdff4487ffb1b8ecae0082e1b8a9ec717efda9b79c6e8afa1ffe529e7db2bf4410b4e1fc9a8587ec972f42aa2015195c0d9d1f2af049222 WHIRLPOOL 321116c02386fdabedcd5a8910a575b02007c82fd4ae43bf285eec1478875b5ff5b530f0fc4789e78d38e80a7d13938c80b100f7c666a1693a02701452cc9915
 MISC metadata.xml 230 SHA256 5b66abf10f340308f2e1a4f3a275e110a2a52842e683bd2a1eb84d387a5ea163 SHA512 d55a5077c6ece4bb2da3d869023175b49a9ff6f20aed4696ede22e729ef823c4d162911ed3fd85fe29973600813624e4d5d5d6d2a9c82395abe0090f76e673dd WHIRLPOOL 726f7c4456a23191c433f978002121826d71729ad750a862a80229b828ebe6d2d2410ad2a87229380608d9880e38c21c441a778963d38c7ad3a646c66f2eed35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLRxnsACgkQC77qH+pIQ6TOzAD9E72QhnPaeN0huwaR2mqulBS+
-XukkMXmUyjwaax2pxaQA/jMuEhxh6hURmE1Dgr395qtrPDRWjGKSdoNNpCmG5hMZ
-=AH6H
+iF4EAREIAAYFAlLaoyMACgkQC77qH+pIQ6S2LQEAx6m+RJJW+BObfUDWi7s36cJe
+9O1eMU7/6OfBnuRH/IEBAI+u6ghYXCnGrNuUE/7mtUt7QFc0x7m/O+KCV1SAj+qu
+=/LFH
 -----END PGP SIGNATURE-----

diff --git a/files/webtest-1.4.3-doctest.patch b/files/webtest-1.4.3-doctest.patch
new file mode 100644 (file)
index 0000000..15b65c5
--- /dev/null
+++ b/files/webtest-1.4.3-doctest.patch
@@ -0,0 +1,15 @@
+This doctest relies on dictionary key order, so remove it.
+--- a/docs/index.txt
++++ b/docs/index.txt
+@@ -321,11 +321,6 @@
+     <Element html at ...>
+     >>> res.lxml.xpath('//body/div')[0].text
+     'hey!'
+-    >>> res = TestResponse(content_type='application/json',
+-    ...                    body=b'{"a":1,"b":2}')
+-    >>> res.request = TestRequest.blank('/')
+-    >>> list(res.json.values())
+-    [1, 2]
+     >>> res = TestResponse(content_type='application/xml',
+     ...                    body=b'<xml><message>hey!</message></xml>')
+     >>> res.request = TestRequest.blank('/')

diff --git a/webtest-1.4.3-r1.ebuild b/webtest-1.4.3-r1.ebuild
index 4f1dc26b8bdc13720f474798da09920ce01a583f..0893d160d64406ae03a0903add0c8e18abebfcac 100644 (file)
--- a/webtest-1.4.3-r1.ebuild
+++ b/webtest-1.4.3-r1.ebuild
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
                virtual/python-unittest2[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}/webtest-1.4.3-doctest.patch" )
 
 python_compile_all() {
        if use doc; then