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

Extend the DESCRIBE_SNAPSHOTS_RESPONSE to include the tagSet as documented by AWS. Also refactor the names of the tests I introduced in previous commits to be more descriptive. Finally some code cleanup, removing the get_tags method from classes and instead inherit from the TaggedEC2Resource class.

Browse source
This commit is contained in:
Peter Van Bouwel 2014-11-09 15:00:40 +01:00
commit 2f1f993793
3 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tests/test_ec2/test_tags.py
View file

@ -257,7 +257,7 @@ def test_get_all_tags_value_filter():
@mock_ec2
def test_create_tags_must_set_tags_on_retrieved_instances():
def test_retrieved_instances_must_contain_their_tags():
tag_key = 'Tag name'
tag_value = 'Tag value'
tags_to_be_set = {tag_key: tag_value}
@ -288,7 +288,7 @@ def test_create_tags_must_set_tags_on_retrieved_instances():
@mock_ec2
def test_create_tags_must_set_tags_on_retrieved_volumes():
def test_retrieved_volumes_must_contain_their_tags():
tag_key = 'Tag name'
tag_value = 'Tag value'
tags_to_be_set = {tag_key: tag_value}
@ -307,4 +307,26 @@ def test_create_tags_must_set_tags_on_retrieved_volumes():
volume.delete()
#Check whether tag is present with correct value
retrieved_tags[tag_key].should.equal(tag_value)
retrieved_tags[tag_key].should.equal(tag_value)
@mock_ec2
def test_retrieved_snapshots_must_contain_their_tags():
tag_key = 'Tag name'
tag_value = 'Tag value'
tags_to_be_set = {tag_key: tag_value}
conn = boto.connect_ec2('the_key', 'the_secret')
volume = conn.create_volume(80, "us-east-1a")
snapshot = conn.create_snapshot(volume.id)
conn.create_tags([snapshot.id], tags_to_be_set)
#Fetch the snapshot again
all_snapshots = conn.get_all_snapshots()
snapshot = all_snapshots[0]
retrieved_tags = snapshot.tags
conn.delete_snapshot(snapshot.id)
volume.delete()
#Check whether tag is present with correct value
retrieved_tags[tag_key].should.equal(tag_value)