diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2010-07-20 07:31:18 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2010-07-20 07:31:18 +0000 |
| commit | 596d208d49861eeb806a7454ed316b4ef421c113 (patch) | |
| tree | 12fefd7d3bfc91e92edf342af2496f1706f4ddf0 /dev-python/testtools | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-596d208d49861eeb806a7454ed316b4ef421c113.tar.gz gentoo-2-596d208d49861eeb806a7454ed316b4ef421c113.tar.bz2 gentoo-2-596d208d49861eeb806a7454ed316b4ef421c113.zip | |
fix tests with upstream patch
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'dev-python/testtools')
| -rw-r--r-- | dev-python/testtools/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/testtools/files/testtools-0.9.4-fix_test.patch | 10 | ||||
| -rw-r--r-- | dev-python/testtools/testtools-0.9.4.ebuild | 9 |
3 files changed, 22 insertions, 3 deletions
diff --git a/dev-python/testtools/ChangeLog b/dev-python/testtools/ChangeLog index 6873da7b0446..33b1d2016497 100644 --- a/dev-python/testtools/ChangeLog +++ b/dev-python/testtools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/testtools # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.11 2010/07/18 06:48:32 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.12 2010/07/20 07:31:17 fauli Exp $ + + 20 Jul 2010; Christian Faulhammer <fauli@gentoo.org> + testtools-0.9.4.ebuild, +files/testtools-0.9.4-fix_test.patch: + fix tests with upstream patch *testtools-0.9.4 (18 Jul 2010) diff --git a/dev-python/testtools/files/testtools-0.9.4-fix_test.patch b/dev-python/testtools/files/testtools-0.9.4-fix_test.patch new file mode 100644 index 000000000000..688627bf374f --- /dev/null +++ b/dev-python/testtools/files/testtools-0.9.4-fix_test.patch @@ -0,0 +1,10 @@ +=== modified file 'testtools/testresult/real.py' +--- testtools/testresult/real.py 2010-07-02 00:40:20 +0000 ++++ testtools/testresult/real.py 2010-07-19 17:37:46 +0000 +@@ -566,4 +566,4 @@ + if not chars[-1].endswith('\n'): + chars.append('\n') + chars.append('------------\n') +- return _u(''.join(chars)) ++ return _u('').join(chars) + diff --git a/dev-python/testtools/testtools-0.9.4.ebuild b/dev-python/testtools/testtools-0.9.4.ebuild index 46b9153eed29..6c5848f51b99 100644 --- a/dev-python/testtools/testtools-0.9.4.ebuild +++ b/dev-python/testtools/testtools-0.9.4.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.4.ebuild,v 1.2 2010/07/18 14:01:04 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.4.ebuild,v 1.3 2010/07/20 07:31:17 fauli Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" -inherit distutils versionator +inherit distutils versionator eutils SERIES="$(get_version_component_range 1-2)" @@ -21,6 +21,11 @@ IUSE="" DEPEND="" RDEPEND="" +src_prepare() { + # fixed upstream for everything > 0.9.4 + epatch "${FILESDIR}"/${P}-fix_test.patch +} + src_test() { testing() { PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" -m testtools.run testtools.tests.test_suite |