patch to fix tests for py3

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 48 insertions, 14 deletions

diff --git a/dev-python/celery/ChangeLog b/dev-python/celery/ChangeLog
index 453dd38e6b46..c0e707e75f18 100644
--- a/dev-python/celery/ChangeLog
+++ b/dev-python/celery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/celery
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.30 2014/04/09 10:52:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.31 2014/04/26 09:15:26 idella4 Exp $
+
+  26 Apr 2014; Ian Delaney <idella4@gentoo.org> +files/celery-3.1.10-test.patch,
+  celery-3.1.10.ebuild:
+  patch to fix tests for py3
 
 *celery-3.1.10 (09 Apr 2014)
 
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 163df3c88798..e97fbee9fe48 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX celery-3.0.11-require-python-dateutil-2.1.patch 1219 SHA256 6803b6aa70eef403285d05e0b2894bff660d56eb8184eff9efb186e8be1b0218 SHA512 2a7eb1c9cbffefdc0d3927c752918cdb6c13eeedc4d7896ff8a47612a2e883fd1de33eecb801d8d810bdcdbf45e021fe08f5ca2d6448ab2b750fddce41f1bfe8 WHIRLPOOL 88905787a0b6e797efe0c01dee2f8e64ee8ddbe5b7ad7cc861ee1754e8f43c1d9e4e8a5706194bfb281cfa010bf1eb042c19cf5e46ea5ba77404e200da776c70
 AUX celery-3.0.12-require-python-dateutil-2.1.patch 1221 SHA256 cf6aadb6c44b78ccd235ad4ba4e4b22034a9054f1f561de1b6bd9d59d5d49b4b SHA512 31fe2428ba80b4ca58ad5d13590945b0e0c71b090aa162a2c1062f8c5f4da8293606408ab16c99951f56880414c3a153b53c77f8b48859d790c48f36c11556da WHIRLPOOL caf13426644d12ec752bc282fe9c6483c042b368b4db367f037abe373ecd9ef729bb752fc91105448c850a59c2b948b3a54d1df6b88b2f37282aeee4f641f39b
+AUX celery-3.1.10-test.patch 1752 SHA256 515d28c8979dfa985a29d96aee3fa70bb588e91a5346cd032a6aa9f280c1caeb SHA512 6c72073e24eaeb5bde6f22d8d66e7ab1e5d94c801a1e9dd47d83b21ca605072c8e1c538742119828d9143749bd52ed72c4b572de1f349d4a0c7d0e25db98651e WHIRLPOOL 433db9d66df552fdc9990e052ce5ebdec939e3303dd134d7ff4b3526d20f337f8e87d59c3946d150f7cb2fa7c07b12c7089c68deb487468c3bdd761fb9684bb9
 AUX celery-docs.patch 779 SHA256 7fe9c7458abc6dd62f076c5904cf219aec2e42425758e59881d786e1536c5039 SHA512 813d3a772ce0ab19854519915f770d5785371f9d8b0c916e93a286383c4262f0c6a9e554c5d76fc0d81e53efbdc8ed4a7a7009ae07c71489e30464d7b0de6ef1 WHIRLPOOL 4935c4c8d812e486e33b33d67913a91c2c86c0093ed4f4b8aa808ad191c2c3aa427ae52c1c8357a5a8c36cbe1d77185f5b28332f3762589740240704e6a3902f
 AUX celery.confd 1860 SHA256 33d824dee40c01f79ea177b7e574a7e061e943fe728426760030ae3faeaecb1c SHA512 7d7389f3c3201f7d00e7183c2f2eeae52ef64495114c08fb19e0425909019fa6470df5687d7fa6992d5ef1e2905fecbe79e1ea8e1d08f56bf7bee38377735acb WHIRLPOOL 71e14e0bcc3a7d65f5eb8d70cadbf3fbcb13cdb30436bdf112e5c0e86420c5a51192bd2514bac76319524f5d6d0de192801319afe5bf2d5f23c2d17968af1275
 AUX celery.confd-r1 1377 SHA256 91971f917a1e282a59ec24e1488d469c2e2aea96def79c20ad8133731dd75f57 SHA512 3f1e1292ba20c146d4986f7aaaf2a93e62188eb4a8a515742938bbe4414f19b1f1402c047b7737e967caadadb445cca3d36c5e60fe4d9c165383c9e80a76226f WHIRLPOOL 2aa4ff3d2ed957e93e07fbce9508e1be926bfbc3c3db61ac3d74bb3cd1baa19973ebe43abeadaf770610bdea6c9da3dedb74d81f4bf79d488c6128c86dd062aa
@@ -25,13 +26,13 @@ EBUILD celery-3.0.16.ebuild 2326 SHA256 69a19a63c2a7020787614de14c25c15d76f5d4b1
 EBUILD celery-3.0.17.ebuild 2326 SHA256 e1f606fb2bf9d35b70e48029f8d1d0ef5d68cb11e19b370c7217269ddc12499a SHA512 a3f38cd63a08fdd6e29a70a416f00499c331fc9efb0ade827cfeeb722efe62dba27c942e92e534e4b23104f21b6cb36e8139e033aa84dee124256d86cc33c5ca WHIRLPOOL 0ca6f1973d058cee843e3efa9d2cb021e0b75e89f5ed50e28011e035239226416e8fbbe01803b9297368b0dec08e55f9c26ac6575f9fd8c3232e7b6fa844303e
 EBUILD celery-3.0.19.ebuild 2395 SHA256 30b24eb659930edbb7b3334965ff73a27a83f0159a1dfa598f394c2321973bc2 SHA512 1229d425c5d276cfdac72cd2700566a8a0d3c65e29e7b442f5aff3bf8ff160af0ea6bfd31c5ff4557b41c07a3e7e6f6fa9067dc39cd47337a24f731602b1ed2f WHIRLPOOL d0b9023e9b1d1cfef89adb10bde70b5977a66c1068d246589b6a836e62008979c2c62f58b9badba4dab1d83f2806d907fd99e776d52e76913be29162e0af0ea0
 EBUILD celery-3.0.21.ebuild 2395 SHA256 98304dd19a8ad6544702753a432176671951bd2ae0815d44f20a4b4d7efcfec3 SHA512 009a54cd9b1eb59326b62dc2e89ca356df50b2844839879a34cb32ee14b62989fc44ed259bf4250edddee4efd04facc6b1ae16d406a3bf940fe882a98e0125c5 WHIRLPOOL 59be02430dc19ab44c685bed5084a5b473e7902a9ea2480ee12a07e9ca46a7f23f23d10a1f482bbcfef65f7356ad361f4982ba8ee2d702b89316959e8a46c7ea
-EBUILD celery-3.1.10.ebuild 2316 SHA256 0570236a998011e37510bc731196162beca7de38f26ee9fa2b741418fb58e376 SHA512 06c21f54ee1fa474e47bf2060a9598e4771107f2bb5c2c35a45531b40ca8dc77e813a7b8151e61665310b6edc80852d36c88b63a6afcbd2fa841fe720a5ab072 WHIRLPOOL 03d68caf04f955b97859783d700b7f437399ef1f11be873a7af6da800b2d297ed3c72c6af35079f878401eb355616c79490297ed7c437cba39ee8c0c8d1b615c
-MISC ChangeLog 5210 SHA256 11e40bfddf8e0893e77ebf4b63e38e044771c33fe7147f0c21a92f647dd55d3b SHA512 3b46c6ea6039138f1e25342bac1e5fc75f43c1b3008ce5e2a6cd530c0e2df750b34c951da1e56d7183ccee1277bb7fe941667ba0c616c81eedb1d4b50e681937 WHIRLPOOL 7c13ba4ae986131dc14dc3a67b935c5113c1024eb5c2bb4d9b616067c6772d6d58c7073e4d2c84e66b7b257a37f06d0424e55b5618131596722fd27db80b97d2
+EBUILD celery-3.1.10.ebuild 2189 SHA256 04e200bcd63670d5ee4a2759f3f9b4bdf96985373a2280e2f466489e3e5d93a5 SHA512 29945f0c55712585ede2ede0673077619f35e1ab62ff78248e29d81c4e9bca4b7e938c47bbc9e66f8f1d2f658cfedf19e9b4a44c1f7c3b37c722525c77a224e3 WHIRLPOOL 32e1b237935f56941497e620ede7896065576d079088fceef1b97989651a83e75fe254d0a0c63e06fa093c38d45d5f59479971d8be64cadc6a41e24ad714775d
+MISC ChangeLog 5345 SHA256 f60c198042591f25939b886f21a65396547b4a9244adbd6b3018255a7608a8fc SHA512 452338c14311bbaf003cd3059e156e1f9355218b8c4155fafae080a853a3f456dfb87d7635fa57759787748e3b9ac86ba2f56428b48a02db1f95de87016f8472 WHIRLPOOL 0b696ed32a49b49769834dfb82dc53ea968d2f5abf4bcc2dcbb5f7ddf907cf452af3e722b1594f2e0d18b4770e0afef0a7fbb7381af84c22f30ae18036cc4601
 MISC metadata.xml 337 SHA256 eaa4f67043b6768b8e9780428d478af5ce978550d1e525d51cfe7c9c8129c4ea SHA512 0d11efc64238d61565d354e7cd58a0a13a83397426f358e2625daa6d81fa101bf4390789834cc6a1818656794e3b25bd71485662c16d644d5caedfac624b5be7 WHIRLPOOL b804d28878153c55f6bc0af8d17ab349f1be3cc4f49c23e446cb919d5fe3a2da23867bd1dc22b305ee0881440fcb40c7d70860e98b0d26973536ec89c351a316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNFJNMACgkQso7CE7gHKw2tdgCgzr7iclTQ2rzd3MP2S+QVMoDB
-vQoAoOJmnQ01LMFZKmr9cjBoxwx0GFY5
-=tQZt
+iEYEAREIAAYFAlNbd3cACgkQso7CE7gHKw2dqACfcSckY1NpFRycVzAcyYAZR5Qp
+Or8An3HQPsRA6PHOudJVqTm8vUOjElGd
+=m/av
 -----END PGP SIGNATURE-----
diff --git a/dev-python/celery/celery-3.1.10.ebuild b/dev-python/celery/celery-3.1.10.ebuild
index 4e1722a82528..1dddaf5fbdf5 100644
--- a/dev-python/celery/celery-3.1.10.ebuild
+++ b/dev-python/celery/celery-3.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.1.10.ebuild,v 1.1 2014/04/09 10:52:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.1.10.ebuild,v 1.2 2014/04/26 09:15:26 idella4 Exp $
 
 EAPI=5
 
@@ -45,7 +45,8 @@ DEPEND="${RDEPEND}
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/celery-docs.patch )
+PATCHES=( "${FILESDIR}"/celery-docs.patch 
+		"${FILESDIR}"/${P}-test.patch)
 
 python_compile_all() {
 	if use doc; then
@@ -56,12 +57,7 @@ python_compile_all() {
 
 python_test() {
 	# https://github.com/celery/celery/issues/1964
-	if python_is_python3; then
-		nosetests -e test_get_task_meta_for -e test_cleanup -e test_restore_group \
-			|| die "Tests failed with ${EPYTHON}"
-	else
-		nosetests  -e test_cleanup || die "Tests failed with ${EPYTHON}"
-	fi
+	nosetests -e test_cleanup || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/celery/files/celery-3.1.10-test.patch b/dev-python/celery/files/celery-3.1.10-test.patch
new file mode 100644
index 000000000000..94fcac92fbf3
--- /dev/null
+++ b/dev-python/celery/files/celery-3.1.10-test.patch
@@ -0,0 +1,33 @@
+https://github.com/celery/celery/commit/fb48b1f357f7a416d1413d0056158a74191185af.diff
+diff --git a/celery/tests/backends/test_mongodb.py b/celery/tests/backends/test_mongodb.py
+index f7546d3..a32d9ed 100644
+--- a/celery/tests/backends/test_mongodb.py
++++ b/celery/tests/backends/test_mongodb.py
+@@ -196,9 +196,10 @@ def test_get_task_meta_for(self, mock_get_database):
+         mock_get_database.assert_called_once_with()
+         mock_database.__getitem__.assert_called_once_with(MONGODB_COLLECTION)
+         self.assertEqual(
+-            ['status', 'task_id', 'date_done', 'traceback', 'result',
+-             'children'],
+-            list(ret_val.keys()))
++            list(sorted(['status', 'task_id', 'date_done', 'traceback',
++                         'result', 'children'])),
++            list(sorted(ret_val.keys())),
++        )
+ 
+     @patch('celery.backends.mongodb.MongoBackend._get_database')
+     def test_get_task_meta_for_no_result(self, mock_get_database):
+@@ -253,8 +253,8 @@ def test_restore_group(self, mock_get_database):
+         mock_collection.find_one.assert_called_once_with(
+             {'_id': sentinel.taskset_id})
+         self.assertEqual(
+-            ['date_done', 'result', 'task_id'],
+-            list(ret_val.keys()),
++            list(sorted(['date_done', 'result', 'task_id'])),
++            list(sorted(ret_val.keys())),
+         )
+ 
+     @patch('celery.backends.mongodb.MongoBackend._get_database')
+#diff -ur celery-3.1.10.orig/celery/tests/backends/test_mongodb.py celery-3.1.10/celery/tests/backends/test_mongodb.py
+#--- celery-3.1.10.orig/celery/tests/backends/test_mongodb.py	2014-02-28 21:43:26.000000000 +0800
+#+++ celery-3.1.10/celery/tests/backends/test_mongodb.py	2014-04-17 11:43:00.818430253 +0800