churchyard / rpms / python38

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