From ce0c60b0347a507593667141d897f7b9ceddd087 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Mon, 8 Jan 2024 23:31:40 +0000 Subject: [PATCH 1/2] gh-113027: Fix timezone check in test_variable_tzname in test_email --- Lib/test/test_email/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py index 0f1c3a84e61abd..57508e9078334c 100644 --- a/Lib/test/test_email/test_utils.py +++ b/Lib/test/test_email/test_utils.py @@ -147,7 +147,7 @@ def test_localtime_epoch_notz_daylight_false(self): def test_variable_tzname(self): t0 = datetime.datetime(1984, 1, 1, tzinfo=datetime.timezone.utc) t1 = utils.localtime(t0) - if t1.tzname() == 'Europe': + if t1.tzname() != 'MSK': self.skipTest("Can't find a Kyiv timezone database") self.assertEqual(t1.tzname(), 'MSK') t0 = datetime.datetime(1994, 1, 1, tzinfo=datetime.timezone.utc) From f2edcb200eb68a49a75b926c638d5c6f1139d666 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Tue, 9 Jan 2024 09:11:01 +0000 Subject: [PATCH 2/2] Update test_utils.py Co-authored-by: Serhiy Storchaka --- Lib/test/test_email/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py index 57508e9078334c..d04b3909efa643 100644 --- a/Lib/test/test_email/test_utils.py +++ b/Lib/test/test_email/test_utils.py @@ -147,7 +147,7 @@ def test_localtime_epoch_notz_daylight_false(self): def test_variable_tzname(self): t0 = datetime.datetime(1984, 1, 1, tzinfo=datetime.timezone.utc) t1 = utils.localtime(t0) - if t1.tzname() != 'MSK': + if t1.tzname() in ('Europe', 'UTC'): self.skipTest("Can't find a Kyiv timezone database") self.assertEqual(t1.tzname(), 'MSK') t0 = datetime.datetime(1994, 1, 1, tzinfo=datetime.timezone.utc)