Fix tests (bug #326857).

Package-Manager: portage-HEAD/cvs/Linux x86_64

4 files changed, 12 insertions, 30 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/Manifest b/dev-python/django/Manifest
index 28a940d13020..761117914de0 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX django-1.1.1-fix_tests.patch 840 RMD160 4a5a121c37fe883209505312be39dc2a9143413e SHA1 ecb48a057b5c037ecff653ff11bf7c9cd0fb1ef6 SHA256 88f7d237b7e8ee14ea44704e4b51cd12e2a1b8355e1569a59065659093665cf6
 DIST Django-1.0.4.tar.gz 5088869 RMD160 9f61455bc4cc0277ddfe4a957863d5995f8c23f3 SHA1 a8b9f33adb007146b8b57f22f0f38467f0d2693a SHA256 a9388a047814bbe356c43d3d2e3afff42b1f93190c86aa4ac72f828a5ef107eb
 DIST Django-1.1.1.tar.gz 5614106 RMD160 bf42e548ff86fc587086eaffc53d9397e2a8c871 SHA1 441c54f0e90730bf4a55432b64519169b1e6ef20 SHA256 d65b18319496fc4923b37fdb736e5ba1a90a3a18e2d7eaac7f3ad30738d1f6e4
@@ -9,14 +6,7 @@ DIST Django-1.2.1.tar.gz 6248006 RMD160 25904c6f450e88404256f951ee39cb6b39de5f76
 EBUILD django-1.0.4.ebuild 2798 RMD160 d651fb7b3cd6e4c910fe715c5b8231f55e073b00 SHA1 ed3ffa0d87f92a53632fabe7264fb5a1996cbb17 SHA256 80a8f064e2e2db5bc871dc450ce178a1c157cba844754c268e8ceb27f7497a10
 EBUILD django-1.1.1.ebuild 2905 RMD160 54bb51c2b1f3ae15df025fae35bc40949277efc1 SHA1 72e55bd601bde3854b85b200a528253fedd19d67 SHA256 367ad96a992390dd0e5f2a41bf03e232273d2dab7b4881b30068c8fc753f121e
 EBUILD django-1.1.2.ebuild 2835 RMD160 d7adce436411ea13aaf677d94159ff050ce5ba69 SHA1 3ec18bfa09222b3d4b4c8426275614c22ff94553 SHA256 a7e9778dd26e5181e1f815c9943f4921b414f861873a5fa6dd5133be0901d33f
-EBUILD django-1.2.1.ebuild 2839 RMD160 6c172e790deff15bde714159775e5777dd58e350 SHA1 a25488768b6d6a0bb807aa2247eafd4ae2ea626e SHA256 cd0dd92d7a875fe104ffb940c56f168333b1a68bc25471d6b6304b25c17ac408
-EBUILD django-9999.ebuild 2692 RMD160 f0e0c8340549542bf510810e51cb7abff67503d8 SHA1 8eda5ac7de9d6226a1020fd8eaf180d4bbe8eb51 SHA256 7db4373064caad0d60bf782c2096d684325f7839485f3a26be946e298600bbc6
-MISC ChangeLog 7242 RMD160 9281202c11adf35cbb2299aabc630df918f0f4be SHA1 1722d8333d275eae8b7aade44281f07f58ace2d5 SHA256 2a5f474a6889b38569dcf26d93f309b9c8c0f2eec3d282ebb348e7e08e0b229d
+EBUILD django-1.2.1.ebuild 2707 RMD160 da3a0212cdf9d912f670fcc3d25370a7c2c4e44e SHA1 06f9736db49a8e9ac1caca2933817062c2252afe SHA256 187520bd947427eb4761560901841de7402f730a664756b5f2fc1fa167504447
+EBUILD django-9999.ebuild 2560 RMD160 137785a0c204bed0cfd77b40c7f9372c76f78499 SHA1 3236c16920a3524cb6122f224700f7e8ceab8888 SHA256 804a66b112878a0fd291530bc2f858a03d76da28a41694c3a5e89f8ae244bbfe
+MISC ChangeLog 7389 RMD160 73520ac659c108630c24af9894786d0397e10090 SHA1 f74f9e655ba6547039e85ed074f49b009492995e SHA256 95c93a7c2ed283f923ee3d5372fda6c71b17aabf0fc97d182873b51318a70075
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwjzzcACgkQCaWpQKGI+9RejgCcDsmym7fJtFSGjtAOJJduosW+
-Gw8AnA5iH0RwyU8bHWNmNEaSlU3BPFsX
-=OP1W
------END PGP SIGNATURE-----
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
 }