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

update ec2 calls for boto 2.5 compat

Browse source
This commit is contained in:
Steve Pulec 2013-02-28 00:08:35 -05:00
commit 98fc1eeab9
4 changed files with 44 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/test_ec2/test_amis.py
View file

@ -11,7 +11,7 @@ def test_ami_create_and_delete():
conn = boto.connect_ec2('the_key', 'the_secret')
reservation = conn.run_instances('<ami-image-id>')
instance = reservation.instances[0]
image = instance.create_image("test-ami", "this is a test ami")
image = conn.create_image(instance.id, "test-ami", "this is a test ami")
all_images = conn.get_all_images()
all_images[0].id.should.equal(image)
@ -33,6 +33,6 @@ def test_ami_pulls_attributes_from_instance():
instance = reservation.instances[0]
instance.modify_attribute("kernel", "test-kernel")
image_id = instance.create_image("test-ami", "this is a test ami")
image_id = conn.create_image(instance.id, "test-ami", "this is a test ami")
image = conn.get_image(image_id)
image.kernel_id.should.equal('test-kernel')
expect(image.kernel_id).should.equal('test-kernel')

6
tests/test_ec2/test_instances.py
View file

@ -21,7 +21,7 @@ def test_instance_launch_and_terminate():
instances[0].id.should.equal(instance.id)
instances[0].state.should.equal('pending')
conn.terminate_instances(instances[0].id)
conn.terminate_instances([instances[0].id])
reservations = conn.get_all_instances()
instance = reservations[0].instances[0]
@ -40,7 +40,7 @@ def test_instance_start_and_stop():
for instance in stopped_instances:
instance.state.should.equal('stopping')
started_instances = conn.start_instances(instances[0].id)
started_instances = conn.start_instances([instances[0].id])
started_instances[0].state.should.equal('pending')
@ -76,4 +76,4 @@ def test_instance_attribute_user_data():
instance_attribute = instance.get_attribute("userData")
instance_attribute.should.be.a(InstanceAttribute)
instance_attribute.get("userData").should.equal("this is my user data")
expect(instance_attribute.get("userData")).should.equal("this is my user data")