diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-07-06 13:28:19 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-07-06 13:28:19 +0000 |
| commit | ad5dabaa8ab4599ad53cefc2dabf67c50a3bf425 (patch) | |
| tree | ae86d77bc1cbcec3bebbda1ab806e9deb3694c11 /dev-python | |
| parent | Keyword ~ppc64 wrt #313563 (diff) | |
| download | gentoo-2-ad5dabaa8ab4599ad53cefc2dabf67c50a3bf425.tar.gz gentoo-2-ad5dabaa8ab4599ad53cefc2dabf67c50a3bf425.tar.bz2 gentoo-2-ad5dabaa8ab4599ad53cefc2dabf67c50a3bf425.zip | |
Fix tests (bug #326857).
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/django/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/django/django-1.2.1.ebuild | 10 | ||||
| -rw-r--r-- | dev-python/django/django-9999.ebuild | 10 |
3 files changed, 9 insertions, 17 deletions
diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog index 4a686849e882..6bc80f87721e 100644 --- a/dev-python/django/ChangeLog +++ b/dev-python/django/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/django # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.47 2010/06/24 21:33:37 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.48 2010/07/06 13:28:19 arfrever Exp $ + + 06 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + django-1.2.1.ebuild, django-9999.ebuild: + Fix tests (bug #326857). 24 Jun 2010; Pacho Ramos <pacho@gentoo.org> django-1.1.2.ebuild: stable amd64, bug 324461 diff --git a/dev-python/django/django-1.2.1.ebuild b/dev-python/django/django-1.2.1.ebuild index a5ff5e69df1e..70f3dacb698a 100644 --- a/dev-python/django/django-1.2.1.ebuild +++ b/dev-python/django/django-1.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.2.1.ebuild,v 1.1 2010/05/26 17:59:26 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.2.1.ebuild,v 1.2 2010/07/06 13:28:19 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -57,15 +57,9 @@ src_compile() { src_test() { testing() { - cat >> tests/settings.py << __EOF__ -DATABASE_ENGINE='sqlite3' -DATABASE_NAME='test.db' -ROOT_URLCONF='tests/urls.py' -SITE_ID=1 -__EOF__ # Tests have non-standard assumptions about PYTHONPATH and # don't work with usual "build-${PYTHON_ABI}/lib". - PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=settings -v1 + PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1 } python_execute_function testing } diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild index e10f47599215..ccbd2fc4b23c 100644 --- a/dev-python/django/django-9999.ebuild +++ b/dev-python/django/django-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.6 2010/05/26 17:58:12 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.7 2010/07/06 13:28:19 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -57,15 +57,9 @@ src_compile() { src_test() { testing() { - cat >> tests/settings.py << __EOF__ -DATABASE_ENGINE='sqlite3' -DATABASE_NAME='test.db' -ROOT_URLCONF='tests/urls.py' -SITE_ID=1 -__EOF__ # Tests have non-standard assumptions about PYTHONPATH and # don't work with usual "build-${PYTHON_ABI}/lib". - PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=settings -v1 + PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1 } python_execute_function testing } |