From: Ian Delaney Date: Sat, 4 Apr 2015 08:36:01 +0000 (+0000) Subject: add patch (from upstream) to fix broken tests X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=78d372cb78431764d3b5cfb5ec9dd41419476094;p=gentoo.git add patch (from upstream) to fix broken tests Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- diff --git a/dev-python/flask-testing/ChangeLog b/dev-python/flask-testing/ChangeLog index c4dcd9d08655..f3d4d60fa2b8 100644 --- a/dev-python/flask-testing/ChangeLog +++ b/dev-python/flask-testing/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/flask-testing # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-testing/ChangeLog,v 1.8 2015/01/16 03:47:13 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-testing/ChangeLog,v 1.9 2015/04/04 08:35:35 idella4 Exp $ + + 04 Apr 2015; Ian Delaney +files/0.4.2-test-fix.patch, + flask-testing-0.4.2.ebuild: + add patch (from upstream) to fix broken tests 16 Jan 2015; Patrick Lauer flask-testing-0.4.2.ebuild: Stable on amd64 and x86 for 527558 diff --git a/dev-python/flask-testing/Manifest b/dev-python/flask-testing/Manifest index d40330c0f629..d355c911303c 100644 --- a/dev-python/flask-testing/Manifest +++ b/dev-python/flask-testing/Manifest @@ -1,8 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX 0.4.2-test-fix.patch 652 SHA256 eee3b5cc4a27cbe5bd1a76c7dc49654faefb7f265025ba46271756a7dd07b939 SHA512 f6ae344e20cc707f4894fb5005f3aee4f903ddf9df604e8178b8b25ac6fada35d8d1150815ee573a84219349ded6762a92ba174b38a2e6479b4bc97a44299a19 WHIRLPOOL ebd44d789714198b5cbbdd6751abacecf0b8b5973029b4a3701db873fea4c972692c2d5b1021ad5d26ca224026858823b371954a9a37668aa0c3d5947420a96e DIST Flask-Testing-0.4.1.tar.gz 39879 SHA256 d8c4d97d79de517a5d6e348bcc6aaccc45832827afa25ca15cdf8a5a16e543a2 SHA512 b7b71a40545aebed2616b5867951078930bc5d2ab6bf4bc259fab4f8d127ace3830f71bdb4a654c96bf5379bce49930c84e77486c8111b0645bfc515428592b0 WHIRLPOOL e3310b41b53da9847ad3143db30359af8a3eb515da42cc4ffc3068d681abb78a8d11302fb26d085197627aae7d7408175819a108dcf25fd2c0270e02ceaef9b7 DIST Flask-Testing-0.4.2.tar.gz 40994 SHA256 921c7c653e0d511ed87fbf70d984e27afea8dfa7e10b358689863d7a63e05321 SHA512 57f1a58f352637b6c1d4dc5aa8b3cac215eae334f355d40b6c777f9c5a769c745ce11f2a98818669ec2c29fc170fd86fe4670bb66bd4e4607174b21c5c2067e3 WHIRLPOOL a1fc0723660c25cb18ea5eb4c283c79eb379f2d8cee1bf8fda6ed8b10391cdf0080fa3e2e1ce6cdc50845548a5d9be3f4b20ef267c1350a14049adfbdcfa8e20 DIST Flask-Testing-0.4.tar.gz 37581 SHA256 6c0f8910be5b28caafbefd95c4a9c30cb9609d1bd502ac41364363b9a041e60f SHA512 6711cd5cbf8043d21ece7b779d864c286ca74d95dedd3e505ac97eafd5d6bc031021d97cf8a7851b8f8a40f8ed83f45ce0772cbfa80045eb936ce65b1937e331 WHIRLPOOL cfd5ba814881010e3c7246cd596b75527aef576231b9138ac2c550192346285043e5360d56f1d839849620d18a1d1eac55aa579978fe07a5419900f3ef7d461e EBUILD flask-testing-0.4.1.ebuild 947 SHA256 aa6b8c9fc63732b50b302ceaba58f3041738a319510bad5e0ac8f9e29478f399 SHA512 efaf24fd1a204f68e60c16d6c1b2cfbf6fd31dbd854621ba8b9f4245d98b27ef5aa4237d56b8de1a2296ef0b03d1b023eca8552d444a79c2903b13fe743f0a6e WHIRLPOOL a1347e80ff65cdd355cbca33cca6210a38f4b18be7ce5329122204ab71389580d7a8f4e7403d070188962c894a46978b5bc5a71de8bc7f349e3b7eaf9ba2fa01 -EBUILD flask-testing-0.4.2.ebuild 1039 SHA256 f53d349b5fdce0db8a0c02b6713f268d50a7942a752c1fec3959865da93a9f14 SHA512 03256a680fbb4e177ef6267c7fc30fe54405d518c52dd37a3e0044cc45144d63bb2781a18eace024e31320c1bface102d15ec8a45e32395d062fbb74fa729b62 WHIRLPOOL c592f67bb6bf8206cba807fa5d12cb554bac15437a7f67003a3840948d97aa5ce982b2a14736ea260ce354c815b6c9ba84045db74f6b2591cc0bd202700893ee +EBUILD flask-testing-0.4.2.ebuild 1048 SHA256 22e4a46c6b908053dbc91d29bc840d16dbb2e6b43e128cfed66daefc89e3dd69 SHA512 ae5ea864aed6a8215c3dc67edfce073f1dad200a86e62dda2809bbc109e863b8cc954e9ea3754d08b4eef9dabb214645904bc04aadc9d3b9a15f67722ac7c287 WHIRLPOOL 26aac7a7f3a1d39d69526caf36ce4db0c3de7fac02474f4fd665eab9aea96bbcd491780dc696d96dba143ed614093cfd578c19eec44b366d665ed98b756133e2 EBUILD flask-testing-0.4.ebuild 915 SHA256 5bac72006c05631dc317baca1fa68a641b01d7fe0a50b987d7649c361522169a SHA512 eadbeb2afd9f1864166b67b9a38dc99ed7ed05ada8d8e7b5c500d8ad6868a2bdddd3f0c633688a1c86e6c9164790c7f89a47a9675b6137a583482617bb18b385 WHIRLPOOL 896f9f87a9eb6fe20c9dc7cef5a23ad9c6b942e71564662c848058c3c5bf9dca917fba0f596e5bb181596a51b9a6c3bebb23b9f310cc634bc3347e286a617584 -MISC ChangeLog 1250 SHA256 5c260a37d3dc2200f60dce4f9b4eabeea2caa89bae0867ce053af23171622922 SHA512 683e4064466c776aca7976120d7d9dd7734061a2c94eba7b901659357204ad962a3d913fd438d89f33bd35f4141f863fa83c90017c28f362fad4e316b284aba7 WHIRLPOOL bf7b96e53d3a69301cba07dcf0b91eb83cbd67db990db15dae31a709a24af4d5b592195d164352e298868f6c2be2e29d92e4474d390a34bfc0d306d53f325a6c +MISC ChangeLog 1406 SHA256 2ea17e958742ead9106d49b6e2332721c42fa3bb0cc7f6cc8226a4c8e2b66bca SHA512 91dbd235b4b18b0ed687eb693a2f4e37db594adde53484227284e3e70c202c44ed68864b512504627d7fa4ee0547729cfa3984df62bd1f8cc31af980674f5fb2 WHIRLPOOL 201737df068cf954e2797897014764f60eb982cb1c54018eb2c8d8e70db0f06173a0681f0a15224ace136bf555a6f07b58292b0572f071a69b18748d6b516296 MISC metadata.xml 236 SHA256 9483faa975220c6c3e9aba7b8329e194c2f64f1b7147444d4dce47fd5f27b7e4 SHA512 048dbf295f8279223680343f91aac8aed3815025e7a68f58da015289141be43e3c215427cd42becba79b82f9c22e9c45ae29398e536b781e4a04deaa6f66888d WHIRLPOOL 61e958c5efa8594af4dfc14de14e53e6584e6bb74d73ea9abdbf6390f3767a6c5c97b30383b0426b5848b65bf5b0efc023bc880cbca547ba96c4c8510af4448d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEAREIAAYFAlUfomcACgkQso7CE7gHKw07nACgz6wbQEQ199Nyks6DOSV3+a3g +0CoAnRunH5lUvKzBrFkvyY70qFDI4d5W +=hF41 +-----END PGP SIGNATURE----- diff --git a/dev-python/flask-testing/files/0.4.2-test-fix.patch b/dev-python/flask-testing/files/0.4.2-test-fix.patch new file mode 100644 index 000000000000..a0933e475afc --- /dev/null +++ b/dev-python/flask-testing/files/0.4.2-test-fix.patch @@ -0,0 +1,17 @@ +https://github.com/jarus/flask-testing/commit/c969b41b31f60a5a8bacd44b3eb63d1642f2d8bf +diff --git a/flask_testing/utils.py b/flask_testing/utils.py +index add12ef..9b479df 100644 +--- a/flask_testing/utils.py ++++ b/flask_testing/utils.py +@@ -143,8 +143,8 @@ def _post_teardown(self): + + if _is_signals: + template_rendered.disconnect(self._add_template) +- if hasattr(self, '_true_render'): +- templating._render = self._true_render ++ if hasattr(self, '_original_template_render'): ++ templating._render = self._original_template_render + + if self.run_gc_after_test: + gc.collect() + diff --git a/dev-python/flask-testing/flask-testing-0.4.2.ebuild b/dev-python/flask-testing/flask-testing-0.4.2.ebuild index 0c8d909c35ba..dbf463e07675 100644 --- a/dev-python/flask-testing/flask-testing-0.4.2.ebuild +++ b/dev-python/flask-testing/flask-testing-0.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-testing/flask-testing-0.4.2.ebuild,v 1.2 2015/01/16 03:47:13 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-testing/flask-testing-0.4.2.ebuild,v 1.3 2015/04/04 08:35:35 idella4 Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 pypy ) @@ -18,8 +18,6 @@ LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" IUSE="test" -# Testsuite fails with concurrent threads -DISTUTILS_NO_PARALLEL_BUILD=1 RDEPEND="dev-python/flask[${PYTHON_USEDEP}] dev-python/twill[${PYTHON_USEDEP}]" @@ -29,10 +27,11 @@ DEPEND="${RDEPEND} dev-python/blinker[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" - S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${PV}-test-fix.patch ) + python_test() { - # https://github.com/jarus/flask-testing/issues/60 + # test phase appears to run only py2.7 but if it passes for py2.7 is passes for pypy nosetests || die "Testing failed with ${EPYTHON}" }