From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 27 Nov 2018 12:01:00 +0000 (-0800) Subject: bpo-35317: Fix mktime() error in test_email (GH-10721) X-Git-Tag: v3.6.8rc1~77 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b59fc311609aadaafaae68240127b4997b85859d;p=thirdparty%2FPython%2Fcpython.git 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 --- 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 @@ class LocaltimeTests(unittest.TestCase): 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 @@ class LocaltimeTests(unittest.TestCase): 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.