Fix DescribeImages to throw error if AMI requested does not exist

2014-01-28 18:14:00 -05:00 · 2014-01-28 18:14:00 -05:00 · 90aa87d53e
commit 90aa87d53e
parent 32f0d7e16c
5 changed files with 25 additions and 6 deletions
--- a/moto/ec2/models.py
+++ b/moto/ec2/models.py
@ -222,6 +222,8 @@ class AmiBackend(object):
    def describe_images(self, ami_ids=None):
        if ami_ids:
            images = [image for image in self.amis.values() if image.id in ami_ids]
+            for missing_ami in set(ami_ids) - set(ami.id for ami in images):
+                raise InvalidIdError(missing_ami)
        else:
            images = self.amis.values()
        return images