Matej Cepl
f0feb071a7
runner is not sufficient to run the test suite here). - Refresh patches fix-tests.patch, system_zoneinfo.patch, 0001-Fix-tests-for-older-timezone-versions.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=73
89 lines
3.2 KiB
Diff
89 lines
3.2 KiB
Diff
From ba0f4aa2cb32d3e0338c389a0ee32ae8ceb1f367 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Bechtold <tbechtold@suse.com>
|
|
Date: Wed, 28 Jun 2017 12:28:31 +0200
|
|
Subject: [PATCH] Fix tests for older timezone versions
|
|
|
|
This improves the fix from commit c00dbe290b .
|
|
---
|
|
src/pytz/tests/test_tzinfo.py | 26 ++++++++++++++------------
|
|
1 file changed, 14 insertions(+), 12 deletions(-)
|
|
|
|
--- a/pytz/tests/test_tzinfo.py
|
|
+++ b/pytz/tests/test_tzinfo.py
|
|
@@ -247,12 +247,13 @@ class USEasternDSTStartTestCase(unittest
|
|
|
|
def _test_tzname(self, utc_dt, wanted):
|
|
tzname = wanted['tzname']
|
|
+ if not isinstance(tzname, list):
|
|
+ tzname = [tzname]
|
|
dt = utc_dt.astimezone(self.tzinfo)
|
|
- self.assertEqual(
|
|
- dt.tzname(), tzname,
|
|
- 'Expected %s as tzname for %s. Got %s' % (
|
|
- tzname, str(utc_dt), dt.tzname()
|
|
- )
|
|
+ self.assertIn(dt.tzname(), tzname,
|
|
+ 'Expected %s as tzname for %s. Got %s' % (
|
|
+ tzname, str(utc_dt), dt.tzname()
|
|
+ )
|
|
)
|
|
|
|
def _test_utcoffset(self, utc_dt, wanted):
|
|
@@ -510,7 +511,7 @@ class NoumeaHistoryStartTestCase(USEaste
|
|
'dst': timedelta(0),
|
|
}
|
|
after = {
|
|
- 'tzname': '+11', # pre-2017a, NCT
|
|
+ 'tzname': ['+11', 'NCT'], # pre-2017a, NCT
|
|
'utcoffset': timedelta(hours=11),
|
|
'dst': timedelta(0),
|
|
}
|
|
@@ -521,12 +522,12 @@ class NoumeaDSTEndTestCase(USEasternDSTS
|
|
tzinfo = pytz.timezone('Pacific/Noumea')
|
|
transition_time = datetime(1997, 3, 1, 15, 00, 00, tzinfo=UTC)
|
|
before = {
|
|
- 'tzname': '+12', # pre-2017a, NCST
|
|
+ 'tzname': ['+12', 'NCST'], # pre-2017a, NCST
|
|
'utcoffset': timedelta(hours=12),
|
|
'dst': timedelta(hours=1),
|
|
}
|
|
after = {
|
|
- 'tzname': '+11', # pre-2017a, NCT
|
|
+ 'tzname': ['+11', 'NCT'], # pre-2017a, NCT
|
|
'utcoffset': timedelta(hours=11),
|
|
'dst': timedelta(0),
|
|
}
|
|
@@ -550,7 +551,7 @@ class TahitiTestCase(USEasternDSTStartTe
|
|
'dst': timedelta(0),
|
|
}
|
|
after = {
|
|
- 'tzname': '-10', # pre-2017a, TAHT
|
|
+ 'tzname': ['-10', 'TAHT'], # pre-2017a, TAHT
|
|
'utcoffset': timedelta(hours=-10),
|
|
'dst': timedelta(0),
|
|
}
|
|
@@ -563,12 +564,12 @@ class SamoaInternationalDateLineChange(U
|
|
tzinfo = pytz.timezone('Pacific/Apia')
|
|
transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC)
|
|
before = {
|
|
- 'tzname': '-10', # pre-2017a, SDT
|
|
+ 'tzname': ['-10', 'SDT'], # pre-2017a, SDT
|
|
'utcoffset': timedelta(hours=-10),
|
|
'dst': timedelta(hours=1),
|
|
}
|
|
after = {
|
|
- 'tzname': '+14', # pre-2017a, WSDT
|
|
+ 'tzname': ['+14', 'WSDT'], # pre-2017a, WSDT
|
|
'utcoffset': timedelta(hours=14),
|
|
'dst': timedelta(hours=1),
|
|
}
|
|
@@ -618,7 +619,7 @@ class LocalTestCase(unittest.TestCase):
|
|
|
|
loc_time = loc_tz.localize(datetime(1940, 5, 10, 0, 0, 0))
|
|
# pre-2017a, abbreviation was NCT
|
|
- self.assertEqual(loc_time.strftime('%Z%z'), '+0020+0020')
|
|
+ self.assertIn(loc_time.strftime('%Z%z'), ['NET+0020', '+0020+0020'])
|
|
|
|
loc_time = loc_tz.localize(datetime(1940, 5, 20, 0, 0, 0))
|
|
self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
|