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

Make AMI test more explicit with region.

Browse Source
This commit is contained in:
Steve Pulec 2014-11-15 10:06:14 -05:00
parent c77207a8b8
commit b39861052b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_ec2/test_amis.py
View File

@ -1,9 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
# Ensure 'assert_raises' context manager support for Python 2.6 # Ensure 'assert_raises' context manager support for Python 2.6
import tests.backport_assert_raises import tests.backport_assert_raises # noqa
from nose.tools import assert_raises from nose.tools import assert_raises
import boto import boto
import boto.ec2
from boto.exception import EC2ResponseError from boto.exception import EC2ResponseError
import sure # noqa import sure # noqa
@ -55,7 +56,7 @@ def test_ami_create_and_delete():
@requires_boto_gte("2.14.0") @requires_boto_gte("2.14.0")
@mock_ec2 @mock_ec2
def test_ami_copy(): def test_ami_copy():
conn = boto.connect_ec2('the_key', 'the_secret') conn = boto.ec2.connect_to_region("us-west-1")
reservation = conn.run_instances('ami-1234abcd') reservation = conn.run_instances('ami-1234abcd')
instance = reservation.instances[0] instance = reservation.instances[0]
@ -183,6 +184,7 @@ def test_ami_filters():
amis_by_name = conn.get_all_images(filters={'name': imageA.name}) amis_by_name = conn.get_all_images(filters={'name': imageA.name})
set([ami.id for ami in amis_by_name]).should.equal(set([imageA.id])) set([ami.id for ami in amis_by_name]).should.equal(set([imageA.id]))
@mock_ec2 @mock_ec2
def test_ami_filtering_via_tag(): def test_ami_filtering_via_tag():
conn = boto.connect_vpc('the_key', 'the_secret') conn = boto.connect_vpc('the_key', 'the_secret')
@ -309,4 +311,3 @@ def test_ami_attribute():
attribute='launchPermission', attribute='launchPermission',
operation='remove', operation='remove',
user_ids=['user']).should.throw(NotImplementedError) user_ids=['user']).should.throw(NotImplementedError)