catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #736 from okomestudio/ts/botocore_update

Browse source 
Remove botocore version pinning
This commit is contained in:
Steve Pulec 2016-11-06 09:50:28 -05:00 • committed by GitHub
commit 721d1b3a3f
7 changed files with 74 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/test_emr/test_emr.py
View file

@ -46,6 +46,8 @@ def test_describe_cluster():
'Configurations.member.1.Classification': 'yarn-site',
'Configurations.member.1.Properties.entry.1.key': 'someproperty',
'Configurations.member.1.Properties.entry.1.value': 'somevalue',
'Configurations.member.1.Properties.entry.2.key': 'someotherproperty',
'Configurations.member.1.Properties.entry.2.value': 'someothervalue',
'Instances.EmrManagedMasterSecurityGroup': 'master-security-group',
'Instances.Ec2SubnetId': 'subnet-8be41cec',
},

16
tests/test_emr/test_emr_boto3.py
View file

@ -63,7 +63,8 @@ def test_describe_cluster():
args['Applications'] = [{'Name': 'Spark', 'Version': '2.4.2'}]
args['Configurations'] = [
{'Classification': 'yarn-site',
'Properties': {'someproperty': 'somevalue'}}]
'Properties': {'someproperty': 'somevalue',
'someotherproperty': 'someothervalue'}}]
args['Instances']['AdditionalMasterSecurityGroups'] = ['additional-master']
args['Instances']['AdditionalSlaveSecurityGroups'] = ['additional-slave']
args['Instances']['Ec2KeyName'] = 'mykey'
@ -232,8 +233,8 @@ def test_describe_job_flow():
jf['LogUri'].should.equal(args['LogUri'])
jf['Name'].should.equal(args['Name'])
jf['ServiceRole'].should.equal(args['ServiceRole'])
jf.shouldnt.have.key('Steps')
jf.shouldnt.have.key('SupportedProducts')
jf['Steps'].should.equal([])
jf['SupportedProducts'].should.equal([])
jf['VisibleToAllUsers'].should.equal(True)
@ -320,7 +321,7 @@ def test_run_job_flow():
resp['LogUri'].should.equal(args['LogUri'])
resp['VisibleToAllUsers'].should.equal(args['VisibleToAllUsers'])
resp['Instances']['NormalizedInstanceHours'].should.equal(0)
resp.shouldnt.have.key('Steps')
resp['Steps'].should.equal([])
@mock_emr
@ -445,10 +446,11 @@ def test_bootstrap_actions():
{'Name': 'bs1',
'ScriptBootstrapAction': {
'Args': ['arg1', 'arg2'],
'Path': 'path/to/script'}},
'Path': 's3://path/to/script'}},
{'Name': 'bs2',
'ScriptBootstrapAction': {
'Path': 'path/to/anotherscript'}}
'Args': [],
'Path': 's3://path/to/anotherscript'}}
]
client = boto3.client('emr', region_name='us-east-1')
@ -658,4 +660,4 @@ def test_tags():
client.remove_tags(ResourceId=cluster_id, TagKeys=[t['Key'] for t in input_tags])
resp = client.describe_cluster(ClusterId=cluster_id)['Cluster']
resp.shouldnt.have.key('Tags')
resp['Tags'].should.equal([])