Fix a test that fails in some timezones (bug #409329).

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 48 insertions, 4 deletions

diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index 2cfe23c50adf..2e747f57fcde 100644
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/twisted
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.153 2012/03/22 07:03:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.154 2012/04/13 15:38:48 marienz Exp $
+
+  13 Apr 2012; Marien Zwart <marienz@gentoo.org>
+  +files/twisted-12.0.0-fix-test-timeFormatting.patch, twisted-12.0.0.ebuild:
+  Fix a test that fails in some timezones (bug #409329).
 
 *twisted-12.0.0 (22 Mar 2012)
 
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 13076a49e531..3b61ff19def0 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX twistd.conf 277 RMD160 c959b879d6f7358b647c71c3b514a4a6c8a49eef SHA1 661269a3ce6ed02f03d4fce07757e77420fd44c4 SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2db7606416119
 AUX twistd.init 564 RMD160 73df65867f20a87e7f8e555641e8a379b910aada SHA1 acfff358465e1ecece590c915cd746e4e1011fde SHA256 23898c134daa7ffa6df2cd4e6dbf5d9ad0539ebf80b43974dfa1343a2523a8fe
+AUX twisted-12.0.0-fix-test-timeFormatting.patch 850 RMD160 c191f959292ecf5979dbe89de38b0ee703d566f4 SHA1 c2249a4b2aeeeba5e13dcb9cb812033a95a2e03a SHA256 90ff427a74a6b88fcd617795ef21ecc6732e1a3e245a70e13d8993f333e11664
 AUX twisted-2.1.0-echo-less.patch 269 RMD160 c7fd9d87325a453ce9215591fc296b4b31505369 SHA1 779c8ab267702a3efdbbd1566f390746e8801ebe SHA256 1f190151c00c37dc5055f9b2b1dd7b0943523f29d57f78d5ca5f57723e3d9705
 AUX twisted-2.1.0-zsh-head.patch 592 RMD160 1fc8e7f8de64055e3801b442b4f666aef567ac71 SHA1 645f9ff44ff3b360026d0471092fd1b5f41d7122 SHA256 c9b8a994685159f21a3b0512eed1144876453db09f8d6843529dc0ef8d886029
 AUX twisted-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 419 RMD160 b3a00d9cbb94332c1b20c96e342679b8c165c2e9 SHA1 9ee00b607d0ebd9f54867c95cbc321c47129e272 SHA256 f8e35bfeb14010ddd2c372fc5a9ae2ce0c72aa67bd452b2ccd12368f31c28818
@@ -10,6 +14,13 @@ DIST TwistedCore-12.0.0.tar.bz2 1394195 RMD160 3b65b1b804ee791827913385209012b31
 EBUILD twisted-10.2.0.ebuild 3446 RMD160 69a6b870d4275ba4c425ae0b28e89dc6cd98834d SHA1 717b128db755e353370592a14820672180a87a82 SHA256 68fb8a5f383e7ccef9076df86ba050f4142bc9ba4659c902ca208ca3f47ac3a1
 EBUILD twisted-11.0.0.ebuild 3453 RMD160 da43106f15195c3dd8d885e4ba3df3774a714e30 SHA1 57adc2dbe9878675dc773c136d58f5568bc0620f SHA256 65a9e9dbf7193f2f6799289dfde50ab210f93a00e4dd273bbb5a840d6847161b
 EBUILD twisted-11.1.0.ebuild 3318 RMD160 f4abda185b4711b8d9e60b54f536fc94d9ed9a17 SHA1 cdd2cb5803a1d6a4c2f2ed67016e3235e16c6eb8 SHA256 1ba4ab3d8bc72ff7d61fb71682095ebb983116bad6c4086c5cefb72c898556c1
-EBUILD twisted-12.0.0.ebuild 3318 RMD160 0d1154cf5332ebef899125e22dc5b6b707ee24f9 SHA1 7bb3282c3a82afb5704d54c5cfb91ea66556cdf4 SHA256 a331291896168652a6f61cb6e2359f5e659274daedb9feaaa5de9b7ace627af6
-MISC ChangeLog 24429 RMD160 51939cdb8e73048b251c52ce27620a01b8d77bc2 SHA1 8159530789b497c70b20a6805132d34d032451f0 SHA256 be66c5cf46fefac3e1da9617d1add01bb3cd57a66ad11a0cac11a1ce31bf6ef8
+EBUILD twisted-12.0.0.ebuild 3420 RMD160 bbd498960895a2edf7165efef3f32f48960d2f99 SHA1 d09522872722413382efbf28bdcb99f2743b6425 SHA256 219767ddf4820735ea260f19770befbd02f3066bdea5ab8f1aaaf2f2a4d2a8c9
+MISC ChangeLog 24614 RMD160 fa72359f26b4d8adbb828e9d4f4e104868396cb1 SHA1 c18d5f4e7484fe9051916da5b54d42937058f6a2 SHA256 07797b63f8db1bb31442b0878bcdfb4f1a0f3c5d65588aceadcfbc9d67a7a44f
 MISC metadata.xml 516 RMD160 3603e0b110b1486ed5c02ec37ccee6712e2098c8 SHA1 3fe53dc137c9bd5437e8f6fb1d397491f5e9281e SHA256 702ffca7fc318ecb382067e3bccf620bebd7da614430ea82de24445b9f75524c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAk+ISJAACgkQpnr2roL0g0l0wQD+M8tyw7N66akeLX2/XR+BtEYj
+XbSY6rjrGGHTWchyIw0A/iEg3HiEv0IqNJlCsnNbSdfERclFBAhHiZsU47g1k8GQ
+=uiPL
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted/files/twisted-12.0.0-fix-test-timeFormatting.patch b/dev-python/twisted/files/twisted-12.0.0-fix-test-timeFormatting.patch
new file mode 100644
index 000000000000..a466a973f959
--- /dev/null
+++ b/dev-python/twisted/files/twisted-12.0.0-fix-test-timeFormatting.patch
@@ -0,0 +1,26 @@
+Apply patch: use calendar.timegm instead of manual broken timezone math.
+
+Author: marienz
+Review: itamar
+Fixes: #5583
+
+Index: /trunk/twisted/test/test_log.py
+===================================================================
+--- /trunk/twisted/test/test_log.py	(revision 32453)
++++ /trunk/twisted/test/test_log.py	(revision 34145)
+@@ -6,5 +6,5 @@
+ """
+ 
+-import os, sys, time, logging, warnings
++import os, sys, time, logging, warnings, calendar
+ from cStringIO import StringIO
+ 
+@@ -392,7 +392,5 @@
+         human-readable string.
+         """
+-        # There is no function in the time module which converts a UTC time
+-        # tuple to a timestamp.
+-        when = time.mktime((2001, 2, 3, 4, 5, 6, 7, 8, 0)) - time.timezone
++        when = calendar.timegm((2001, 2, 3, 4, 5, 6, 7, 8, 0))
+ 
+         # Pretend to be in US/Eastern for a moment
diff --git a/dev-python/twisted/twisted-12.0.0.ebuild b/dev-python/twisted/twisted-12.0.0.ebuild
index 2c0e323aa927..60c99a38c6aa 100644
--- a/dev-python/twisted/twisted-12.0.0.ebuild
+++ b/dev-python/twisted/twisted-12.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-12.0.0.ebuild,v 1.1 2012/03/22 07:03:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-12.0.0.ebuild,v 1.2 2012/04/13 15:38:48 marienz Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -34,6 +34,9 @@ src_prepare(){
 	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
 	epatch "${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
 
+	# Fix a test that fails in some timezones.
+	epatch "${FILESDIR}/${P}-fix-test-timeFormatting.patch"
+
 	if [[ "${EUID}" -eq 0 ]]; then
 		# Disable tests failing with root permissions.
 		sed \