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

define setup_networking_deprecated() method to create supporting

Browse Source 
resources for tests that use deprecated methods
This commit is contained in:
captainkerk 2017-12-29 03:00:53 +00:00
parent fe1293ee5b
commit 144611ff99
4 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/autoscaling/exceptions.py
View File

@ -3,7 +3,7 @@ from moto.core.exceptions import RESTError
class AutoscalingClientError(RESTError):
code = 500
code = 400
class ResourceContentionError(AutoscalingClientError):

24
tests/test_autoscaling/test_autoscaling.py
View File

@ -11,13 +11,13 @@ import sure # noqa
from moto import mock_autoscaling, mock_ec2_deprecated, mock_elb_deprecated, mock_elb, mock_autoscaling_deprecated, mock_ec2
from tests.helpers import requires_boto_gte
from utils import setup_networking
from utils import setup_networking, setup_networking_deprecated
@mock_autoscaling_deprecated
@mock_elb_deprecated
def test_create_autoscaling_group():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
elb_conn = boto.ec2.elb.connect_to_region('us-east-1')
elb_conn.create_load_balancer(
'test_lb', zones=[], listeners=[(80, 8080, 'http')])
@ -84,7 +84,7 @@ def test_create_autoscaling_groups_defaults():
""" Test with the minimum inputs and check that all of the proper defaults
are assigned for the other attributes """
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',
@ -177,7 +177,7 @@ def test_list_many_autoscaling_groups():
@mock_autoscaling_deprecated
def test_autoscaling_group_describe_filter():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',
@ -206,7 +206,7 @@ def test_autoscaling_group_describe_filter():
@mock_autoscaling_deprecated
def test_autoscaling_update():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',
@ -238,7 +238,7 @@ def test_autoscaling_update():
@mock_autoscaling_deprecated
def test_autoscaling_tags_update():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',
@ -281,7 +281,7 @@ def test_autoscaling_tags_update():
@mock_autoscaling_deprecated
def test_autoscaling_group_delete():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',
@ -308,7 +308,7 @@ def test_autoscaling_group_delete():
@mock_ec2_deprecated
@mock_autoscaling_deprecated
def test_autoscaling_group_describe_instances():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',
@ -344,7 +344,7 @@ def test_autoscaling_group_describe_instances():
@requires_boto_gte("2.8")
@mock_autoscaling_deprecated
def test_set_desired_capacity_up():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',
@ -380,7 +380,7 @@ def test_set_desired_capacity_up():
@requires_boto_gte("2.8")
@mock_autoscaling_deprecated
def test_set_desired_capacity_down():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',
@ -416,7 +416,7 @@ def test_set_desired_capacity_down():
@requires_boto_gte("2.8")
@mock_autoscaling_deprecated
def test_set_desired_capacity_the_same():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',
@ -452,7 +452,7 @@ def test_set_desired_capacity_the_same():
@mock_autoscaling_deprecated
@mock_elb_deprecated
def test_autoscaling_group_with_elb():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
elb_conn = boto.connect_elb()
zones = ['us-east-1a', 'us-east-1b']
ports = [(80, 8080, 'http'), (443, 8443, 'tcp')]

4
tests/test_autoscaling/test_policies.py
View File

@ -7,11 +7,11 @@ import sure # noqa
from moto import mock_autoscaling_deprecated
from utils import setup_networking
from utils import setup_networking_deprecated
def setup_autoscale_group():
mocked_networking = setup_networking()
mocked_networking = setup_networking_deprecated()
conn = boto.connect_autoscale()
config = LaunchConfiguration(
name='tester',

12
tests/test_autoscaling/utils.py
View File

@ -1,5 +1,6 @@
import boto
import boto3
from moto import mock_ec2
from moto import mock_ec2, mock_ec2_deprecated
@mock_ec2
@ -15,3 +16,12 @@ def setup_networking():
CidrBlock='10.11.2.0/24',
AvailabilityZone='us-east-1b')
return {'vpc': vpc.id, 'subnet1': subnet1.id, 'subnet2': subnet2.id}
@mock_ec2_deprecated
def setup_networking_deprecated():
conn = boto.connect_vpc()
vpc = conn.create_vpc("10.11.0.0/16")
subnet1 = conn.create_subnet(vpc.id, "10.11.1.0/24")
subnet2 = conn.create_subnet(vpc.id, "10.11.2.0/24")
return {'vpc': vpc.id, 'subnet1': subnet1.id, 'subnet2': subnet2.id}