PR#21: Fix FTBFS - rpms/python34 - src.fedoraproject.org

rpms / python34

#21 Fix FTBFS

Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.

rpms/ churchyard/python34 ftbfsfix into master

Require glibc-all-langpacks to test locales

Victor Stinner • 5 years ago

feceac5

Fix mktime() error in test_email

Miro Hrončok • 5 years ago

fd00b4e

00315-test_email-mktime.patch

file added

+46

		`@@ -0,0 +1,46 @@`
		`+ From 0165caf04ef9c615c8b86dd16f7c201ca7a0befa Mon Sep 17 00:00:00 2001`
		`+ From: Victor Stinner <vstinner@redhat.com>`
		`+ Date: Tue, 27 Nov 2018 12:40:50 +0100`
		`+ Subject: [PATCH] bpo-35317: Fix mktime() error in test_email (GH-10721)`
		`+`
		`+ Fix mktime() overflow error in test_email: run`
		`+ test_localtime_daylight_true_dst_true() and`
		`+ test_localtime_daylight_false_dst_true() with a specific timezone.`
		`+ (cherry picked from commit cfaafda8e3e19764682abb4bd4c574accb784c42)`
		`+`
		`+ Co-authored-by: Victor Stinner <vstinner@redhat.com>`
		`+ ---`
		`+ Lib/test/test_email/test_utils.py \| 2 ++`
		`+ .../NEWS.d/next/Tests/2018-11-26-16-54-21.bpo-35317.jByGP2.rst \| 3 +++`
		`+ 2 files changed, 5 insertions(+)`
		`+ create mode 100644 Misc/NEWS.d/next/Tests/2018-11-26-16-54-21.bpo-35317.jByGP2.rst`
		`+`
		`+ diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py`
		`+ index 6dcb3bbe7aab..4e3c3f3a195f 100644`
		`+ --- a/Lib/test/test_email/test_utils.py`
		`+ +++ b/Lib/test/test_email/test_utils.py`
		`+ @@ -75,6 +75,7 @@ def test_localtime_daylight_false_dst_false(self):`
		`+ t2 = utils.localtime(t1)`
		`+ self.assertEqual(t1, t2)`
		`+`
		`+ + @test.support.run_with_tz('Europe/Minsk')`
		`+ def test_localtime_daylight_true_dst_true(self):`
		`+ test.support.patch(self, time, 'daylight', True)`
		`+ t0 = datetime.datetime(2012, 3, 12, 1, 1)`
		`+ @@ -82,6 +83,7 @@ def test_localtime_daylight_true_dst_true(self):`
		`+ t2 = utils.localtime(t1)`
		`+ self.assertEqual(t1, t2)`
		`+`
		`+ + @test.support.run_with_tz('Europe/Minsk')`
		`+ def test_localtime_daylight_false_dst_true(self):`
		`+ test.support.patch(self, time, 'daylight', False)`
		`+ t0 = datetime.datetime(2012, 3, 12, 1, 1)`
		`+ diff --git a/Misc/NEWS.d/next/Tests/2018-11-26-16-54-21.bpo-35317.jByGP2.rst b/Misc/NEWS.d/next/Tests/2018-11-26-16-54-21.bpo-35317.jByGP2.rst`
		`+ new file mode 100644`
		`+ index 000000000000..73a30f71927f`
		`+ --- /dev/null`
		`+ +++ b/Misc/NEWS.d/next/Tests/2018-11-26-16-54-21.bpo-35317.jByGP2.rst`
		`+ @@ -0,0 +1,3 @@`
		+ +Fix ``mktime()`` overflow error in ``test_email``: run
		+ +``test_localtime_daylight_true_dst_true()`` and
		+ +``test_localtime_daylight_false_dst_true()`` with a specific timezone.

python34.spec

file modified

		`@@ -138,6 +138,7 @@`
		`%if %{with_gdbm}`
		`BuildRequires: gdbm-devel`
		`%endif`
		`+ BuildRequires: glibc-all-langpacks`
		`BuildRequires: glibc-devel`
		`BuildRequires: gmp-devel`
		`BuildRequires: libffi-devel`
		`@@ -511,6 +512,12 @@`
		`# Fixed upstream https://bugs.python.org/issue34623`
		`Patch310: 00310-use-xml-sethashsalt-in-elementtree.patch`

		`+ # 00315 #`
		`+ # Fix mktime() error in test_email`
		`+ # http://bugs.python.org/issue35317`
		`+ # https://bugzilla.redhat.com/show_bug.cgi?id=1652843`
		`+ Patch315: 00315-test_email-mktime.patch`
		`+`
		`# (New patches go here ^^^)`
		`#`
		`# When adding new patches to "python" and "python3" in Fedora 17 onwards,`
		`@@ -676,6 +683,7 @@`
		`%patch290 -p1`
		`%patch302 -p1`
		`%patch310 -p1`
		`+ %patch315 -p1`

		`# Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there`
		`# are many differences between 2.6 and the Python 3 library.`