Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2127 from mikegrima/testfixes

Browse Source 
Fixing broken tests #2126
This commit is contained in:
Mike Grima 2019-03-28 11:42:09 -07:00 committed by GitHub
commit 78d7d67751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/cloudformation/models.py
View File

@ -85,9 +85,9 @@ class FakeStack(BaseModel):
def _parse_template(self): def _parse_template(self):
yaml.add_multi_constructor('', yaml_tag_constructor) yaml.add_multi_constructor('', yaml_tag_constructor)
try: try:
self.template_dict = yaml.load(self.template) self.template_dict = yaml.load(self.template, Loader=yaml.Loader)
except yaml.parser.ParserError: except yaml.parser.ParserError:
self.template_dict = json.loads(self.template) self.template_dict = json.loads(self.template, Loader=yaml.Loader)
@property @property
def stack_parameters(self): def stack_parameters(self):

4
tests/test_cloudformation/test_stack_parsing.py
View File

@ -448,8 +448,8 @@ def test_short_form_func_in_yaml_teamplate():
KeySplit: !Split [A, B] KeySplit: !Split [A, B]
KeySub: !Sub A KeySub: !Sub A
""" """
yaml.add_multi_constructor('', yaml_tag_constructor) yaml.add_multi_constructor('', yaml_tag_constructor, Loader=yaml.Loader)
template_dict = yaml.load(template) template_dict = yaml.load(template, Loader=yaml.Loader)
key_and_expects = [ key_and_expects = [
['KeyRef', {'Ref': 'foo'}], ['KeyRef', {'Ref': 'foo'}],
['KeyB64', {'Fn::Base64': 'valueToEncode'}], ['KeyB64', {'Fn::Base64': 'valueToEncode'}],

8
tests/test_kms/test_kms.py
View File

@ -8,8 +8,8 @@ import sure # noqa
from moto import mock_kms, mock_kms_deprecated from moto import mock_kms, mock_kms_deprecated
from nose.tools import assert_raises from nose.tools import assert_raises
from freezegun import freeze_time from freezegun import freeze_time
from datetime import datetime, timedelta from datetime import datetime
from dateutil.tz import tzlocal from dateutil.tz import tzutc
@mock_kms_deprecated @mock_kms_deprecated
@ -660,7 +660,7 @@ def test_schedule_key_deletion():
KeyId=key['KeyMetadata']['KeyId'] KeyId=key['KeyMetadata']['KeyId']
) )
assert response['KeyId'] == key['KeyMetadata']['KeyId'] assert response['KeyId'] == key['KeyMetadata']['KeyId']
assert response['DeletionDate'] == datetime(2015, 1, 31, 12, 0, tzinfo=tzlocal()) assert response['DeletionDate'] == datetime(2015, 1, 31, 12, 0, tzinfo=tzutc())
else: else:
# Can't manipulate time in server mode # Can't manipulate time in server mode
response = client.schedule_key_deletion( response = client.schedule_key_deletion(
@ -685,7 +685,7 @@ def test_schedule_key_deletion_custom():
PendingWindowInDays=7 PendingWindowInDays=7
) )
assert response['KeyId'] == key['KeyMetadata']['KeyId'] assert response['KeyId'] == key['KeyMetadata']['KeyId']
assert response['DeletionDate'] == datetime(2015, 1, 8, 12, 0, tzinfo=tzlocal()) assert response['DeletionDate'] == datetime(2015, 1, 8, 12, 0, tzinfo=tzutc())
else: else:
# Can't manipulate time in server mode # Can't manipulate time in server mode
response = client.schedule_key_deletion( response = client.schedule_key_deletion(

1
tests/test_s3/test_server.py
View File

@ -15,6 +15,7 @@ class AuthenticatedClient(FlaskClient):
def open(self, *args, **kwargs): def open(self, *args, **kwargs):
kwargs['headers'] = kwargs.get('headers', {}) kwargs['headers'] = kwargs.get('headers', {})
kwargs['headers']['Authorization'] = "Any authorization header" kwargs['headers']['Authorization'] = "Any authorization header"
kwargs['content_length'] = 0 # Fixes content-length complaints.
return super(AuthenticatedClient, self).open(*args, **kwargs) return super(AuthenticatedClient, self).open(*args, **kwargs)

1
tests/test_s3bucket_path/test_bucket_path_server.py
View File

@ -13,6 +13,7 @@ class AuthenticatedClient(FlaskClient):
def open(self, *args, **kwargs): def open(self, *args, **kwargs):
kwargs['headers'] = kwargs.get('headers', {}) kwargs['headers'] = kwargs.get('headers', {})
kwargs['headers']['Authorization'] = "Any authorization header" kwargs['headers']['Authorization'] = "Any authorization header"
kwargs['content_length'] = 0 # Fixes content-length complaints.
return super(AuthenticatedClient, self).open(*args, **kwargs) return super(AuthenticatedClient, self).open(*args, **kwargs)