From: Martin Panter <vadmium+py@gmail.com>
Date: Mon, 16 Nov 2015 07:21:38 +0000 (+0000)
Subject: Issue #20220: Add DST rules to work around glibc quirk
X-Git-Tag: v3.5.1rc1~36^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e0889f0c71eebaf5814f4947b09155baa035188;p=python

Issue #20220: Add DST rules to work around glibc quirk

This was triggering intermittent failures in unrelated tests.
---

diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index 96b4f32316..838411e76f 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -55,7 +55,9 @@ class TestImaplib(unittest.TestCase):
                 '"18-May-2033 05:33:20 +0200"']
 
     @run_with_locale('LC_ALL', 'de_DE', 'fr_FR')
-    @run_with_tz('STD-1DST')
+    # DST rules included to work around quirk where the Gnu C library may not
+    # otherwise restore the previous time zone
+    @run_with_tz('STD-1DST,M3.2.0,M11.1.0')
     def test_Time2Internaldate(self):
         expected = '"18-May-2033 05:33:20 +0200"'