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

organizations: fix python 2.7 test errors

Browse Source
This commit is contained in:
Ashley Gould 2018-07-16 07:23:06 -07:00
parent 8f400b7110
commit 01912bdca7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/organizations/models.py
View File

@ -132,7 +132,7 @@ class FakeOrganizationalUnit(BaseModel):
class FakeRoot(FakeOrganizationalUnit):
def __init__(self, organization, **kwargs):
super().__init__(organization, **kwargs)
super(FakeRoot, self).__init__(organization, **kwargs)
self.type = 'ROOT'
self.id = organization.root_id
self.name = 'Root'

9
tests/test_organizations/test_organizations_boto3.py
View File

@ -4,6 +4,7 @@ import boto3
import sure # noqa
import datetime
import yaml
import six
from moto import mock_organizations
from moto.organizations.models import (
@ -64,7 +65,7 @@ def validate_organizational_unit(org, response):
org['Id'],
ou['Id'],
))
ou.should.have.key('Name').should.be.a(str)
ou.should.have.key('Name').should.be.a(six.string_types)
def validate_account(org, account):
@ -86,7 +87,7 @@ def validate_account(org, account):
account['Email'].should.match(EMAIL_REGEX)
account['JoinedMethod'].should.be.within(['INVITED', 'CREATED'])
account['Status'].should.be.within(['ACTIVE', 'SUSPENDED'])
account['Name'].should.be.a(str)
account['Name'].should.be.a(six.string_types)
account['JoinedTimestamp'].should.be.a(datetime.datetime)
@ -101,7 +102,7 @@ def validate_create_account_status(create_status):
])
create_status['Id'].should.match(CREATE_ACCOUNT_STATUS_ID_REGEX)
create_status['AccountId'].should.match(ACCOUNT_ID_REGEX)
create_status['AccountName'].should.be.a(str)
create_status['AccountName'].should.be.a(six.string_types)
create_status['State'].should.equal('SUCCEEDED')
create_status['RequestedTimestamp'].should.be.a(datetime.datetime)
create_status['CompletedTimestamp'].should.be.a(datetime.datetime)
@ -144,7 +145,7 @@ def test_list_roots():
org['Id'],
root['Id'],
))
root.should.have.key('Name').should.be.a(str)
root.should.have.key('Name').should.be.a(six.string_types)
root.should.have.key('PolicyTypes').should.be.a(list)
root['PolicyTypes'][0].should.have.key('Type').should.equal('SERVICE_CONTROL_POLICY')
root['PolicyTypes'][0].should.have.key('Status').should.equal('ENABLED')