Fix test case for when time.tzname[0] is either UTC or GMT. Also have test

output more telling details when there is a failure.

diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py
index 70745eb216b171975255be9be0916c3ffad8f38a..4333b1b63a76d136a4b428702f8c40b6e0263f5d 100644 (file)
--- a/Lib/test/test_strptime.py
+++ b/Lib/test/test_strptime.py
@@ -279,14 +279,19 @@ class StrptimeTests(unittest.TestCase):
         # when time.tzname[0] == time.tzname[1] and time.daylight
         if sys.platform == "mac":
             return #MacOS9 has severely broken timezone support.
-        tz_name= time.tzname[0]
+        tz_name = time.tzname[0]
+        if tz_name.lower() in ("UTC", "GMT"):
+            return
         try:
             original_tzname = time.tzname
             original_daylight = time.daylight
             time.tzname = (tz_name, tz_name)
             time.daylight = 1
             tz_value = _strptime.strptime(tz_name, "%Z")[8]
-            self.failUnlessEqual(tz_value, -1)
+            self.failUnlessEqual(tz_value, -1,
+                    "%s lead to a timezone value of %s instead of -1 when "
+                    "time.daylight set to %s and passing in %s" %
+                    (time.tzname, tz_value, time.daylight, tz_name))
         finally:
             time.tzname = original_tzname
             time.daylight = original_daylight