From db665d82bd0e7210127bbe5621d95fb9af8fa287 Mon Sep 17 00:00:00 2001 From: Lukasz Strzygowski Date: Tue, 20 Mar 2007 08:23:56 +0000 Subject: [PATCH] Fixed tests to die on failure. Excluded testorderby and testorderby_desc which cause failure with sqlite-3.3.12. Package-Manager: portage-2.1.2.2 --- dev-python/sqlalchemy/ChangeLog | 7 ++++- dev-python/sqlalchemy/Manifest | 24 +++++++------- dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild | 31 ++++++++++++++++--- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog index 26b9204a75f0..ac4991101ee2 100644 --- a/dev-python/sqlalchemy/ChangeLog +++ b/dev-python/sqlalchemy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/sqlalchemy # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.6 2007/02/25 10:54:11 lucass Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.7 2007/03/20 08:23:56 lucass Exp $ + + 20 Mar 2007; Lukasz Strzygowski + sqlalchemy-0.3.5.ebuild: + Fixed tests to die on failure. Excluded testorderby and testorderby_desc + which cause failure with sqlite-3.3.12. *sqlalchemy-0.3.5 (25 Feb 2007) diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest index 6956242400cc..046cb5b71428 100644 --- a/dev-python/sqlalchemy/Manifest +++ b/dev-python/sqlalchemy/Manifest @@ -7,14 +7,14 @@ EBUILD sqlalchemy-0.3.4.ebuild 1289 RMD160 a01da3018f25126dc0cd8c2e584b3d79a225c MD5 17ffc048dd2ef41d52eb424ee40376aa sqlalchemy-0.3.4.ebuild 1289 RMD160 a01da3018f25126dc0cd8c2e584b3d79a225ccb6 sqlalchemy-0.3.4.ebuild 1289 SHA256 1f511b614ec2ae8f948f795448ca99700e0d3484abe3fb8422db0ca57515e981 sqlalchemy-0.3.4.ebuild 1289 -EBUILD sqlalchemy-0.3.5.ebuild 1287 RMD160 1163f03bd8d6225218bad22939c8b54840a8405d SHA1 9f5739787668da74b5af873d4ca1f75fe8344621 SHA256 0485cf3400746ab42280ae04bced4465c00e9e486ab081597b47ad801e26586f -MD5 5081086a893bd87aa9b955480180d840 sqlalchemy-0.3.5.ebuild 1287 -RMD160 1163f03bd8d6225218bad22939c8b54840a8405d sqlalchemy-0.3.5.ebuild 1287 -SHA256 0485cf3400746ab42280ae04bced4465c00e9e486ab081597b47ad801e26586f sqlalchemy-0.3.5.ebuild 1287 -MISC ChangeLog 1400 RMD160 a0e68baedab04b3831cb9ec807bfc90ee0ddbdff SHA1 c74a1effd9b3124a06c22e7ba411c6dbe75959fa SHA256 7f98003a89cefd39eca2537ed4923f6c529c947f7978e33a6ad05c467cdaed0e -MD5 ec18b421f71734ba1aaf0c31208cd52f ChangeLog 1400 -RMD160 a0e68baedab04b3831cb9ec807bfc90ee0ddbdff ChangeLog 1400 -SHA256 7f98003a89cefd39eca2537ed4923f6c529c947f7978e33a6ad05c467cdaed0e ChangeLog 1400 +EBUILD sqlalchemy-0.3.5.ebuild 1721 RMD160 15679719d2536e33ed435b803476943dcef0011b SHA1 a07229e777d19d7e3b2e50686b2e813307f44609 SHA256 60e0c5fca7f58cd5f98c354f13c0c662f9fce6985a1709289b833791918bd8a3 +MD5 6911ef089373131d721ccf374addac05 sqlalchemy-0.3.5.ebuild 1721 +RMD160 15679719d2536e33ed435b803476943dcef0011b sqlalchemy-0.3.5.ebuild 1721 +SHA256 60e0c5fca7f58cd5f98c354f13c0c662f9fce6985a1709289b833791918bd8a3 sqlalchemy-0.3.5.ebuild 1721 +MISC ChangeLog 1599 RMD160 001d0bfe81a47a207dad7784ac0dbad4dbcfcf58 SHA1 ced60cd84a59ee5418b5719ac411f7ff17345056 SHA256 28b76865859680e057c2e8d4a903e207a1f36db3b85e50700723263d7b302229 +MD5 52aacd3c073b83d57fd3eb4a18245a32 ChangeLog 1599 +RMD160 001d0bfe81a47a207dad7784ac0dbad4dbcfcf58 ChangeLog 1599 +SHA256 28b76865859680e057c2e8d4a903e207a1f36db3b85e50700723263d7b302229 ChangeLog 1599 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159 @@ -26,9 +26,9 @@ MD5 f9d934e4dbd80382e30eb9d78fe2f36b files/digest-sqlalchemy-0.3.5 250 RMD160 f7ed327b46944653c86808b37b138f7adb406832 files/digest-sqlalchemy-0.3.5 250 SHA256 371aa4636c51f2b413e492f3b20372da28cc3dc93dfa7ec99ddd59912446f69d files/digest-sqlalchemy-0.3.5 250 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF4Wrg2jLqHNfbg2URArV2AJsGDbPuY6Rx/EKmrg5x0xNbVNg8tACgm2Ff -MMSwFFqujOynaGYqoDB+mhE= -=q80Q +iD8DBQFF/5on2jLqHNfbg2URAvsvAJ90rRl2wYzgTx1bGI8xbOL8rf/srACfdDrn +KBvEvjid4z1ddAHSSX8GH28= +=GJRd -----END PGP SIGNATURE----- diff --git a/dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild index bbcf1cbb8cb6..b8ba81ccc29d 100644 --- a/dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild +++ b/dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild,v 1.1 2007/02/25 10:54:11 lucass Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild,v 1.2 2007/03/20 08:23:56 lucass Exp $ + +NEED_PYTHON=2.4 inherit distutils @@ -16,8 +18,7 @@ IUSE="doc examples firebird mssql mysql postgres sqlite test" KEYWORDS="~amd64 ~x86" # note: if you use psycopg-1, then you need egenix-mx-base -RDEPEND=">=dev-lang/python-2.4 - firebird? ( dev-python/kinterbasdb ) +RDEPEND="firebird? ( dev-python/kinterbasdb ) mssql? ( dev-python/pymssql ) mysql? ( dev-python/mysql-python ) postgres? ( @@ -33,6 +34,27 @@ DEPEND="dev-python/setuptools S="${WORKDIR}/${MY_P}" +src_unpack() { + unpack ${A} + cd "${S}" + + # skip testorderby and testorderby_desc + # which require sqlite-3.3.13 to pass + sed -i \ + -e '1048,1060d' \ + -e '1142,1155d' \ + test/orm/mapper.py || die "sed failed" + + sed -i -e 's/sleep(3)/sleep(5)/' \ + test/engine/pool.py || die "sed failed" + + # fix alltests.py to return 1 on failure + sed -i \ + -e '1iimport sys' \ + -e 's/\(testbase\.run.*\)/sys.exit(not \1.wasSuccessful())/' \ + test/alltests.py || die "sed failed" +} + src_install() { distutils_src_install @@ -45,6 +67,5 @@ src_install() { } src_test() { - sed -e 's/sleep(3)/sleep(5)/' -i test/engine/pool.py - PYTHONPATH="./test/" "${python}" test/alltests.py + PYTHONPATH="./test/" "${python}" test/alltests.py || die "tests failed" } -- 2.26.2