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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Stephan Huber 2020-01-23 15:37:40 +01:00
commit 84210f6011
78 changed files with 1510 additions and 618 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/test_ec2/test_availability_zones_and_regions.py
View file

@ -11,7 +11,7 @@ from moto import mock_ec2, mock_ec2_deprecated
def test_describe_regions():
conn = boto.connect_ec2("the_key", "the_secret")
regions = conn.get_all_regions()
regions.should.have.length_of(16)
len(regions).should.be.greater_than(1)
for region in regions:
region.endpoint.should.contain(region.name)
@ -32,7 +32,7 @@ def test_availability_zones():
def test_boto3_describe_regions():
ec2 = boto3.client("ec2", "us-east-1")
resp = ec2.describe_regions()
resp["Regions"].should.have.length_of(16)
len(resp["Regions"]).should.be.greater_than(1)
for rec in resp["Regions"]:
rec["Endpoint"].should.contain(rec["RegionName"])

10
tests/test_ec2/test_regions.py
View file

@ -3,13 +3,21 @@ import boto.ec2
import boto.ec2.autoscale
import boto.ec2.elb
import sure
from boto3 import Session
from moto import mock_ec2_deprecated, mock_autoscaling_deprecated, mock_elb_deprecated
from moto.ec2 import ec2_backends
def test_use_boto_regions():
boto_regions = {r.name for r in boto.ec2.regions()}
boto_regions = set()
for region in Session().get_available_regions("ec2"):
boto_regions.add(region)
for region in Session().get_available_regions("ec2", partition_name="aws-us-gov"):
boto_regions.add(region)
for region in Session().get_available_regions("ec2", partition_name="aws-cn"):
boto_regions.add(region)
moto_regions = set(ec2_backends)
moto_regions.should.equal(boto_regions)