Remove unit test pytz requirement. (#78368)

pull/78375/head
Matt Clay 2 years ago committed by GitHub
parent 1368bfa348
commit b86a18bd27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -7,21 +7,34 @@ __metaclass__ = type
import pytest
from datetime import datetime
from pytz import timezone as tz
from datetime import datetime, timedelta, tzinfo
from ansible.module_utils.common.text.converters import _json_encode_fallback
class timezone(tzinfo):
"""Simple timezone implementation for use until we drop Python 2.7 support."""
def __init__(self, offset):
self._offset = offset
def utcoffset(self, dt):
return self._offset
def dst(self, dt):
return timedelta(0)
def tzname(self, dt):
return None
@pytest.mark.parametrize(
'test_input,expected',
[
(set([1]), [1]),
(datetime(2019, 5, 14, 13, 39, 38, 569047), '2019-05-14T13:39:38.569047'),
(datetime(2019, 5, 14, 13, 47, 16, 923866), '2019-05-14T13:47:16.923866'),
(datetime(2019, 6, 15, 14, 45, tzinfo=tz('UTC')), '2019-06-15T14:45:00+00:00'),
(datetime(2019, 6, 15, 14, 45, tzinfo=tz('Europe/Helsinki')), '2019-06-15T14:45:00+01:40'),
(datetime(2019, 6, 15, 14, 45, tzinfo=timezone(timedelta(0))), '2019-06-15T14:45:00+00:00'),
(datetime(2019, 6, 15, 14, 45, tzinfo=timezone(timedelta(hours=1, minutes=40))), '2019-06-15T14:45:00+01:40'),
]
)
def test_json_encode_fallback(test_input, expected):

@ -11,8 +11,7 @@ import json
import pytest
from collections.abc import Mapping
from datetime import date, datetime
from pytz import timezone as tz
from datetime import date, datetime, timezone, timedelta
from ansible.parsing.ajson import AnsibleJSONEncoder, AnsibleJSONDecoder
from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode
@ -127,8 +126,8 @@ class TestAnsibleJSONEncoder:
(datetime(2019, 5, 14, 13, 47, 16, 923866), '2019-05-14T13:47:16.923866'),
(date(2019, 5, 14), '2019-05-14'),
(date(2020, 5, 14), '2020-05-14'),
(datetime(2019, 6, 15, 14, 45, tzinfo=tz('UTC')), '2019-06-15T14:45:00+00:00'),
(datetime(2019, 6, 15, 14, 45, tzinfo=tz('Europe/Helsinki')), '2019-06-15T14:45:00+01:40'),
(datetime(2019, 6, 15, 14, 45, tzinfo=timezone.utc), '2019-06-15T14:45:00+00:00'),
(datetime(2019, 6, 15, 14, 45, tzinfo=timezone(timedelta(hours=1, minutes=40))), '2019-06-15T14:45:00+01:40'),
]
)
def test_date_datetime(self, ansible_json_encoder, test_input, expected):

@ -1,6 +1,5 @@
bcrypt ; python_version >= '3.8' # controller only
passlib ; python_version >= '3.8' # controller only
pexpect ; python_version >= '3.8' # controller only
pytz
pywinrm ; python_version >= '3.8' # controller only
unittest2 ; python_version < '2.7'

Loading…
Cancel
Save