From dc2fa19d3eb39f332c3696d0a57690d465503a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Ehlert?= Date: Sat, 27 Jul 2019 12:52:04 +0200 Subject: [PATCH 1/9] Prepare tests for import change --- tests/test_apigateway/test_apigateway.py | 3 +- tests/test_autoscaling/test_autoscaling.py | 7 ++- tests/test_autoscaling/test_elbv2.py | 4 +- tests/test_autoscaling/utils.py | 3 +- tests/test_awslambda/test_lambda.py | 7 ++- tests/test_batch/test_batch.py | 6 ++- tests/test_batch/test_cloudformation.py | 7 ++- .../test_cloudformation_stack_crud.py | 4 +- .../test_cloudformation_stack_crud_boto3.py | 5 ++- .../test_cloudformation_stack_integration.py | 45 +++++++++---------- tests/test_cloudformation/test_validate.py | 6 ++- tests/test_core/test_decorator_calls.py | 3 +- tests/test_core/test_instance_metadata.py | 3 +- tests/test_core/test_moto_api.py | 3 +- tests/test_core/test_nested.py | 3 +- tests/test_dynamodb/test_dynamodb.py | 3 +- tests/test_dynamodb2/test_dynamodb.py | 3 +- .../test_dynamodb_table_with_range_key.py | 3 +- .../test_dynamodb_table_without_range_key.py | 3 +- .../test_dynamodbstreams.py | 25 ++++++----- tests/test_ec2/test_amis.py | 3 +- .../test_availability_zones_and_regions.py | 5 ++- tests/test_ec2/test_dhcp_options.py | 3 +- tests/test_ec2/test_elastic_block_store.py | 3 +- tests/test_ec2/test_elastic_ip_addresses.py | 3 +- .../test_elastic_network_interfaces.py | 4 +- tests/test_ec2/test_general.py | 3 +- tests/test_ec2/test_instances.py | 3 +- tests/test_ec2/test_network_acls.py | 3 +- tests/test_ec2/test_regions.py | 4 +- tests/test_ec2/test_route_tables.py | 5 ++- tests/test_ec2/test_security_groups.py | 3 +- tests/test_ec2/test_spot_instances.py | 3 +- tests/test_ec2/test_subnets.py | 4 +- tests/test_ec2/test_tags.py | 5 ++- tests/test_ec2/test_vpc_peering.py | 3 +- tests/test_ec2/test_vpcs.py | 3 +- tests/test_ecs/test_ecs_boto3.py | 3 +- tests/test_elb/test_elb.py | 5 ++- tests/test_elbv2/test_elbv2.py | 5 ++- tests/test_iam/test_iam.py | 3 +- tests/test_iam/test_iam_groups.py | 3 +- tests/test_iotdata/test_iotdata.py | 3 +- tests/test_kinesis/test_kinesis.py | 3 +- tests/test_kms/test_kms.py | 3 +- tests/test_logs/test_logs.py | 3 +- tests/test_rds/test_rds.py | 4 +- tests/test_rds2/test_rds2.py | 4 +- .../test_resourcegroupstaggingapi.py | 8 ++-- tests/test_route53/test_route53.py | 3 +- tests/test_s3/test_s3.py | 4 +- tests/test_s3/test_s3_lifecycle.py | 3 +- tests/test_s3/test_s3_storageclass.py | 3 +- .../test_s3bucket_path/test_s3bucket_path.py | 3 +- tests/test_sns/test_publishing.py | 3 +- tests/test_sns/test_publishing_boto3.py | 3 +- tests/test_sqs/test_sqs.py | 4 +- tests/test_ssm/test_ssm_boto3.py | 3 +- tests/test_sts/test_sts.py | 3 +- tests/test_xray/test_xray_client.py | 4 +- 60 files changed, 190 insertions(+), 99 deletions(-) diff --git a/tests/test_apigateway/test_apigateway.py b/tests/test_apigateway/test_apigateway.py index 5954de8ca2aa..ea571690e3db 100644 --- a/tests/test_apigateway/test_apigateway.py +++ b/tests/test_apigateway/test_apigateway.py @@ -8,7 +8,8 @@ from botocore.exceptions import ClientError import responses -from moto import mock_apigateway, settings +from moto import mock_apigateway +from moto import settings @freeze_time("2015-01-01") diff --git a/tests/test_autoscaling/test_autoscaling.py b/tests/test_autoscaling/test_autoscaling.py index 2df7bf30f5a7..5e11c7061bbb 100644 --- a/tests/test_autoscaling/test_autoscaling.py +++ b/tests/test_autoscaling/test_autoscaling.py @@ -10,7 +10,12 @@ from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_autoscaling, mock_ec2_deprecated, mock_elb_deprecated, mock_elb, mock_autoscaling_deprecated, mock_ec2 +from moto import mock_autoscaling +from moto import mock_ec2_deprecated +from moto import mock_elb_deprecated +from moto import mock_elb +from moto import mock_autoscaling_deprecated +from moto import mock_ec2 from tests.helpers import requires_boto_gte from utils import setup_networking, setup_networking_deprecated, setup_instance_with_networking diff --git a/tests/test_autoscaling/test_elbv2.py b/tests/test_autoscaling/test_elbv2.py index a142fd133c21..b5a43d08490d 100644 --- a/tests/test_autoscaling/test_elbv2.py +++ b/tests/test_autoscaling/test_elbv2.py @@ -2,7 +2,9 @@ import boto3 import sure # noqa -from moto import mock_autoscaling, mock_ec2, mock_elbv2 +from moto import mock_autoscaling +from moto import mock_ec2 +from moto import mock_elbv2 from utils import setup_networking diff --git a/tests/test_autoscaling/utils.py b/tests/test_autoscaling/utils.py index dc38aba3d9b5..5a8019cacf67 100644 --- a/tests/test_autoscaling/utils.py +++ b/tests/test_autoscaling/utils.py @@ -1,7 +1,8 @@ import boto import boto3 from boto import vpc as boto_vpc -from moto import mock_ec2, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated @mock_ec2 diff --git a/tests/test_awslambda/test_lambda.py b/tests/test_awslambda/test_lambda.py index 9ef6fdb0dbca..278b4da56170 100644 --- a/tests/test_awslambda/test_lambda.py +++ b/tests/test_awslambda/test_lambda.py @@ -11,7 +11,12 @@ import sure # noqa from freezegun import freeze_time -from moto import mock_lambda, mock_s3, mock_ec2, mock_sns, mock_logs, settings +from moto import mock_lambda +from moto import mock_s3 +from moto import mock_ec2 +from moto import mock_sns +from moto import mock_logs +from moto import settings from nose.tools import assert_raises from botocore.exceptions import ClientError diff --git a/tests/test_batch/test_batch.py b/tests/test_batch/test_batch.py index 310ac0b48bff..b9b2c0ee0a1a 100644 --- a/tests/test_batch/test_batch.py +++ b/tests/test_batch/test_batch.py @@ -5,7 +5,11 @@ import boto3 from botocore.exceptions import ClientError import sure # noqa -from moto import mock_batch, mock_iam, mock_ec2, mock_ecs, mock_logs +from moto import mock_batch +from moto import mock_iam +from moto import mock_ec2 +from moto import mock_ecs +from moto import mock_logs import functools import nose diff --git a/tests/test_batch/test_cloudformation.py b/tests/test_batch/test_cloudformation.py index 1e37aa3a659c..e9a0eaafd73a 100644 --- a/tests/test_batch/test_cloudformation.py +++ b/tests/test_batch/test_cloudformation.py @@ -5,7 +5,12 @@ import boto3 from botocore.exceptions import ClientError import sure # noqa -from moto import mock_batch, mock_iam, mock_ec2, mock_ecs, mock_logs, mock_cloudformation +from moto import mock_batch +from moto import mock_iam +from moto import mock_ec2 +from moto import mock_ecs +from moto import mock_logs +from moto import mock_cloudformation import functools import nose import json diff --git a/tests/test_cloudformation/test_cloudformation_stack_crud.py b/tests/test_cloudformation/test_cloudformation_stack_crud.py index b7906632b10a..65984972f8e4 100644 --- a/tests/test_cloudformation/test_cloudformation_stack_crud.py +++ b/tests/test_cloudformation/test_cloudformation_stack_crud.py @@ -13,7 +13,9 @@ import tests.backport_assert_raises # noqa from nose.tools import assert_raises -from moto import mock_cloudformation_deprecated, mock_s3_deprecated, mock_route53_deprecated +from moto import mock_cloudformation_deprecated +from moto import mock_s3_deprecated +from moto import mock_route53_deprecated from moto.cloudformation import cloudformation_backends dummy_template = { diff --git a/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py b/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py index d05bc1b530ab..0570d257b385 100644 --- a/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py +++ b/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py @@ -9,7 +9,10 @@ # Ensure 'assert_raises' context manager support for Python 2.6 from nose.tools import assert_raises -from moto import mock_cloudformation, mock_s3, mock_sqs, mock_ec2 +from moto import mock_cloudformation +from moto import mock_s3 +from moto import mock_sqs +from moto import mock_ec2 dummy_template = { "AWSTemplateFormatVersion": "2010-09-09", diff --git a/tests/test_cloudformation/test_cloudformation_stack_integration.py b/tests/test_cloudformation/test_cloudformation_stack_integration.py index 42ddd23514ff..15a0d307e473 100644 --- a/tests/test_cloudformation/test_cloudformation_stack_integration.py +++ b/tests/test_cloudformation/test_cloudformation_stack_integration.py @@ -19,29 +19,28 @@ import boto3 import sure # noqa -from moto import ( - mock_autoscaling_deprecated, - mock_cloudformation, - mock_cloudformation_deprecated, - mock_datapipeline_deprecated, - mock_dynamodb2, - mock_ec2, - mock_ec2_deprecated, - mock_elb, - mock_elb_deprecated, - mock_iam_deprecated, - mock_kms, - mock_lambda, - mock_rds_deprecated, - mock_rds2, - mock_rds2_deprecated, - mock_redshift, - mock_redshift_deprecated, - mock_route53_deprecated, - mock_sns_deprecated, - mock_sqs, - mock_sqs_deprecated, - mock_elbv2) +from moto import mock_autoscaling_deprecated +from moto import mock_cloudformation +from moto import mock_cloudformation_deprecated +from moto import mock_datapipeline_deprecated +from moto import mock_dynamodb2 +from moto import mock_ec2 +from moto import mock_ec2_deprecated +from moto import mock_elb +from moto import mock_elb_deprecated +from moto import mock_iam_deprecated +from moto import mock_kms +from moto import mock_lambda +from moto import mock_rds_deprecated +from moto import mock_rds2 +from moto import mock_rds2_deprecated +from moto import mock_redshift +from moto import mock_redshift_deprecated +from moto import mock_route53_deprecated +from moto import mock_sns_deprecated +from moto import mock_sqs +from moto import mock_sqs_deprecated +from moto import mock_elbv2 from moto.dynamodb2.models import Table from .fixtures import ( diff --git a/tests/test_cloudformation/test_validate.py b/tests/test_cloudformation/test_validate.py index e2c3af05d9c5..ae224c608df4 100644 --- a/tests/test_cloudformation/test_validate.py +++ b/tests/test_cloudformation/test_validate.py @@ -14,7 +14,11 @@ from moto.s3.models import FakeBucket from moto.cloudformation.utils import yaml_tag_constructor from boto.cloudformation.stack import Output -from moto import mock_cloudformation, mock_s3, mock_sqs, mock_ec2 +from moto import mock_cloudformation +from moto import mock_s3 +from moto import mock_sqs +from moto import mock_ec2 + json_template = { "AWSTemplateFormatVersion": "2010-09-09", diff --git a/tests/test_core/test_decorator_calls.py b/tests/test_core/test_decorator_calls.py index 5d2f6a4ef007..e922faba2fb6 100644 --- a/tests/test_core/test_decorator_calls.py +++ b/tests/test_core/test_decorator_calls.py @@ -7,7 +7,8 @@ import tests.backport_assert_raises # noqa from nose.tools import assert_raises -from moto import mock_ec2_deprecated, mock_s3_deprecated +from moto import mock_ec2_deprecated +from moto import mock_s3_deprecated ''' Test the different ways that the decorator can be used diff --git a/tests/test_core/test_instance_metadata.py b/tests/test_core/test_instance_metadata.py index f8bf2481470b..8b783a80c019 100644 --- a/tests/test_core/test_instance_metadata.py +++ b/tests/test_core/test_instance_metadata.py @@ -3,7 +3,8 @@ from nose.tools import assert_raises import requests -from moto import mock_ec2, settings +from moto import mock_ec2 +from moto import settings if settings.TEST_SERVER_MODE: BASE_URL = 'http://localhost:5000' diff --git a/tests/test_core/test_moto_api.py b/tests/test_core/test_moto_api.py index cb0ca89394f9..000b518a83e0 100644 --- a/tests/test_core/test_moto_api.py +++ b/tests/test_core/test_moto_api.py @@ -4,7 +4,8 @@ import requests import boto3 -from moto import mock_sqs, settings +from moto import mock_sqs +from moto import settings base_url = "http://localhost:5000" if settings.TEST_SERVER_MODE else "http://motoapi.amazonaws.com" diff --git a/tests/test_core/test_nested.py b/tests/test_core/test_nested.py index 7c0b8f687681..1a18d7eea401 100644 --- a/tests/test_core/test_nested.py +++ b/tests/test_core/test_nested.py @@ -5,7 +5,8 @@ from boto.sqs.message import Message from boto.ec2 import EC2Connection -from moto import mock_sqs_deprecated, mock_ec2_deprecated +from moto import mock_sqs_deprecated +from moto import mock_ec2_deprecated class TestNestedDecorators(unittest.TestCase): diff --git a/tests/test_dynamodb/test_dynamodb.py b/tests/test_dynamodb/test_dynamodb.py index d48519755c83..64f8631f948a 100644 --- a/tests/test_dynamodb/test_dynamodb.py +++ b/tests/test_dynamodb/test_dynamodb.py @@ -7,7 +7,8 @@ import tests.backport_assert_raises from nose.tools import assert_raises -from moto import mock_dynamodb, mock_dynamodb_deprecated +from moto import mock_dynamodb +from moto import mock_dynamodb_deprecated from moto.dynamodb import dynamodb_backend from boto.exception import DynamoDBResponseError diff --git a/tests/test_dynamodb2/test_dynamodb.py b/tests/test_dynamodb2/test_dynamodb.py index a8f73bee66c9..1360d45367ec 100644 --- a/tests/test_dynamodb2/test_dynamodb.py +++ b/tests/test_dynamodb2/test_dynamodb.py @@ -8,7 +8,8 @@ from boto3.dynamodb.conditions import Attr, Key import sure # noqa import requests -from moto import mock_dynamodb2, mock_dynamodb2_deprecated +from moto import mock_dynamodb2 +from moto import mock_dynamodb2_deprecated from moto.dynamodb2 import dynamodb_backend2 from boto.exception import JSONResponseError from botocore.exceptions import ClientError diff --git a/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py b/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py index e64d7d196425..949afa1c2196 100644 --- a/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py +++ b/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py @@ -8,7 +8,8 @@ from botocore.exceptions import ClientError import sure # noqa from freezegun import freeze_time -from moto import mock_dynamodb2, mock_dynamodb2_deprecated +from moto import mock_dynamodb2 +from moto import mock_dynamodb2_deprecated from boto.exception import JSONResponseError from tests.helpers import requires_boto_gte try: diff --git a/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py b/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py index 1880c7cab89d..0a0c033c7e0c 100644 --- a/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py +++ b/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py @@ -6,7 +6,8 @@ import sure # noqa from freezegun import freeze_time from boto.exception import JSONResponseError -from moto import mock_dynamodb2, mock_dynamodb2_deprecated +from moto import mock_dynamodb2 +from moto import mock_dynamodb2_deprecated from tests.helpers import requires_boto_gte import botocore try: diff --git a/tests/test_dynamodbstreams/test_dynamodbstreams.py b/tests/test_dynamodbstreams/test_dynamodbstreams.py index b60c2105303a..1be6954701e5 100644 --- a/tests/test_dynamodbstreams/test_dynamodbstreams.py +++ b/tests/test_dynamodbstreams/test_dynamodbstreams.py @@ -3,18 +3,19 @@ from nose.tools import assert_raises import boto3 -from moto import mock_dynamodb2, mock_dynamodbstreams +from moto import mock_dynamodb2 +from moto import mock_dynamodbstreams class TestCore(): stream_arn = None mocks = [] - + def setup(self): self.mocks = [mock_dynamodb2(), mock_dynamodbstreams()] for m in self.mocks: m.start() - + # create a table with a stream conn = boto3.client('dynamodb', region_name='us-east-1') @@ -69,20 +70,20 @@ def test_get_shard_iterator(self): resp = conn.describe_stream(StreamArn=self.stream_arn) shard_id = resp['StreamDescription']['Shards'][0]['ShardId'] - + resp = conn.get_shard_iterator( StreamArn=self.stream_arn, ShardId=shard_id, ShardIteratorType='TRIM_HORIZON' ) assert 'ShardIterator' in resp - + def test_get_records_empty(self): conn = boto3.client('dynamodbstreams', region_name='us-east-1') resp = conn.describe_stream(StreamArn=self.stream_arn) shard_id = resp['StreamDescription']['Shards'][0]['ShardId'] - + resp = conn.get_shard_iterator( StreamArn=self.stream_arn, ShardId=shard_id, @@ -116,12 +117,12 @@ def test_get_records_seq(self): TableName='test-streams', Key={'id': {'S': 'entry1'}} ) - + conn = boto3.client('dynamodbstreams', region_name='us-east-1') - + resp = conn.describe_stream(StreamArn=self.stream_arn) shard_id = resp['StreamDescription']['Shards'][0]['ShardId'] - + resp = conn.get_shard_iterator( StreamArn=self.stream_arn, ShardId=shard_id, @@ -165,7 +166,7 @@ def test_enable_stream_on_table(self): 'WriteCapacityUnits': 1} ) assert 'StreamSpecification' not in resp['TableDescription'] - + resp = conn.update_table( TableName='test-streams', StreamSpecification={ @@ -187,7 +188,7 @@ def test_enable_stream_on_table(self): 'StreamViewType': 'OLD_IMAGES' } ) - + def test_stream_with_range_key(self): dyn = boto3.client('dynamodb', region_name='us-east-1') @@ -231,4 +232,4 @@ def test_stream_with_range_key(self): assert len(resp['Records']) == 2 assert resp['Records'][0]['eventName'] == 'INSERT' assert resp['Records'][1]['eventName'] == 'INSERT' - + diff --git a/tests/test_ec2/test_amis.py b/tests/test_ec2/test_amis.py index feff4a16c9d3..a03e15bbb3a8 100644 --- a/tests/test_ec2/test_amis.py +++ b/tests/test_ec2/test_amis.py @@ -9,7 +9,8 @@ from nose.tools import assert_raises import sure # noqa -from moto import mock_ec2_deprecated, mock_ec2 +from moto import mock_ec2_deprecated +from moto import mock_ec2 from moto.ec2.models import AMIS, OWNER_ID from tests.helpers import requires_boto_gte diff --git a/tests/test_ec2/test_availability_zones_and_regions.py b/tests/test_ec2/test_availability_zones_and_regions.py index c64f075ca42a..5971c6ba7618 100644 --- a/tests/test_ec2/test_availability_zones_and_regions.py +++ b/tests/test_ec2/test_availability_zones_and_regions.py @@ -4,7 +4,8 @@ import boto3 import sure # noqa -from moto import mock_ec2, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated @mock_ec2_deprecated @@ -36,7 +37,7 @@ def test_boto3_describe_regions(): for rec in resp['Regions']: rec['Endpoint'].should.contain(rec['RegionName']) - test_region = 'us-east-1' + test_region = 'us-east-1' resp = ec2.describe_regions(RegionNames=[test_region]) resp['Regions'].should.have.length_of(1) resp['Regions'][0].should.have.key('RegionName').which.should.equal(test_region) diff --git a/tests/test_ec2/test_dhcp_options.py b/tests/test_ec2/test_dhcp_options.py index 4e25202412e3..8dbe9fab7e7a 100644 --- a/tests/test_ec2/test_dhcp_options.py +++ b/tests/test_ec2/test_dhcp_options.py @@ -9,7 +9,8 @@ import sure # noqa -from moto import mock_ec2, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated SAMPLE_DOMAIN_NAME = u'example.com' SAMPLE_NAME_SERVERS = [u'10.0.0.6', u'10.0.0.7'] diff --git a/tests/test_ec2/test_elastic_block_store.py b/tests/test_ec2/test_elastic_block_store.py index 9dbaa5ea6777..deec85641268 100644 --- a/tests/test_ec2/test_elastic_block_store.py +++ b/tests/test_ec2/test_elastic_block_store.py @@ -11,7 +11,8 @@ from freezegun import freeze_time import sure # noqa -from moto import mock_ec2_deprecated, mock_ec2 +from moto import mock_ec2_deprecated +from moto import mock_ec2 from moto.ec2.models import OWNER_ID diff --git a/tests/test_ec2/test_elastic_ip_addresses.py b/tests/test_ec2/test_elastic_ip_addresses.py index ca6637b18dc6..8606da02ee06 100644 --- a/tests/test_ec2/test_elastic_ip_addresses.py +++ b/tests/test_ec2/test_elastic_ip_addresses.py @@ -10,7 +10,8 @@ import sure # noqa -from moto import mock_ec2, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated import logging diff --git a/tests/test_ec2/test_elastic_network_interfaces.py b/tests/test_ec2/test_elastic_network_interfaces.py index 05b45fda9794..aaaf827e5394 100644 --- a/tests/test_ec2/test_elastic_network_interfaces.py +++ b/tests/test_ec2/test_elastic_network_interfaces.py @@ -11,7 +11,9 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2, mock_cloudformation_deprecated, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_cloudformation_deprecated +from moto import mock_ec2_deprecated from tests.helpers import requires_boto_gte from tests.test_cloudformation.fixtures import vpc_eni import json diff --git a/tests/test_ec2/test_general.py b/tests/test_ec2/test_general.py index 4c319d30d2ff..950f8ed2364c 100644 --- a/tests/test_ec2/test_general.py +++ b/tests/test_ec2/test_general.py @@ -8,7 +8,8 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2_deprecated, mock_ec2 +from moto import mock_ec2_deprecated +from moto import mock_ec2 @mock_ec2_deprecated diff --git a/tests/test_ec2/test_instances.py b/tests/test_ec2/test_instances.py index a83384709dbf..e6fb39ce78e4 100644 --- a/tests/test_ec2/test_instances.py +++ b/tests/test_ec2/test_instances.py @@ -17,7 +17,8 @@ from freezegun import freeze_time import sure # noqa -from moto import mock_ec2_deprecated, mock_ec2 +from moto import mock_ec2_deprecated +from moto import mock_ec2 from tests.helpers import requires_boto_gte diff --git a/tests/test_ec2/test_network_acls.py b/tests/test_ec2/test_network_acls.py index 1c69624bfb80..a034317d029a 100644 --- a/tests/test_ec2/test_network_acls.py +++ b/tests/test_ec2/test_network_acls.py @@ -5,7 +5,8 @@ from nose.tools import assert_raises from botocore.exceptions import ClientError -from moto import mock_ec2_deprecated, mock_ec2 +from moto import mock_ec2_deprecated +from moto import mock_ec2 @mock_ec2_deprecated diff --git a/tests/test_ec2/test_regions.py b/tests/test_ec2/test_regions.py index f94c78eaf07b..c97caafb84af 100644 --- a/tests/test_ec2/test_regions.py +++ b/tests/test_ec2/test_regions.py @@ -3,7 +3,9 @@ import boto.ec2.autoscale import boto.ec2.elb import sure -from moto import mock_ec2_deprecated, mock_autoscaling_deprecated, mock_elb_deprecated +from moto import mock_ec2_deprecated +from moto import mock_autoscaling_deprecated +from moto import mock_elb_deprecated from moto.ec2 import ec2_backends diff --git a/tests/test_ec2/test_route_tables.py b/tests/test_ec2/test_route_tables.py index de33b3f7a732..202c0dbe48c6 100644 --- a/tests/test_ec2/test_route_tables.py +++ b/tests/test_ec2/test_route_tables.py @@ -9,7 +9,8 @@ from botocore.exceptions import ClientError import sure # noqa -from moto import mock_ec2, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated from tests.helpers import requires_boto_gte @@ -551,4 +552,4 @@ def test_create_route_with_invalid_destination_cidr_block_parameter(): route = route_table.create_route(DestinationCidrBlock=destination_cidr_block, GatewayId=internet_gateway.id) str(ex.exception).should.equal( "An error occurred (InvalidParameterValue) when calling the CreateRoute " - "operation: Value ({}) for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.".format(destination_cidr_block)) \ No newline at end of file + "operation: Value ({}) for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.".format(destination_cidr_block)) diff --git a/tests/test_ec2/test_security_groups.py b/tests/test_ec2/test_security_groups.py index c09b1e8f4730..39aba044ec1d 100644 --- a/tests/test_ec2/test_security_groups.py +++ b/tests/test_ec2/test_security_groups.py @@ -12,7 +12,8 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated @mock_ec2_deprecated diff --git a/tests/test_ec2/test_spot_instances.py b/tests/test_ec2/test_spot_instances.py index ab08d392cd87..ab42b59bcbbc 100644 --- a/tests/test_ec2/test_spot_instances.py +++ b/tests/test_ec2/test_spot_instances.py @@ -9,7 +9,8 @@ import pytz import sure # noqa -from moto import mock_ec2, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated from moto.backends import get_model from moto.core.utils import iso_8601_datetime_with_milliseconds diff --git a/tests/test_ec2/test_subnets.py b/tests/test_ec2/test_subnets.py index 38c36f682ff5..600e67b11b2a 100644 --- a/tests/test_ec2/test_subnets.py +++ b/tests/test_ec2/test_subnets.py @@ -11,7 +11,9 @@ import json import sure # noqa -from moto import mock_cloudformation_deprecated, mock_ec2, mock_ec2_deprecated +from moto import mock_cloudformation_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated @mock_ec2_deprecated diff --git a/tests/test_ec2/test_tags.py b/tests/test_ec2/test_tags.py index 2294979ba9bc..5f4e75f56b70 100644 --- a/tests/test_ec2/test_tags.py +++ b/tests/test_ec2/test_tags.py @@ -10,7 +10,8 @@ from boto.ec2.instance import Reservation import sure # noqa -from moto import mock_ec2_deprecated, mock_ec2 +from moto import mock_ec2_deprecated +from moto import mock_ec2 from nose.tools import assert_raises @@ -408,7 +409,7 @@ def test_create_volume_with_tags(): } ] ) - + assert response['Tags'][0]['Key'] == 'TEST_TAG' diff --git a/tests/test_ec2/test_vpc_peering.py b/tests/test_ec2/test_vpc_peering.py index edfbfb3c2952..4ab83d1d94f4 100644 --- a/tests/test_ec2/test_vpc_peering.py +++ b/tests/test_ec2/test_vpc_peering.py @@ -10,7 +10,8 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated from tests.helpers import requires_boto_gte diff --git a/tests/test_ec2/test_vpcs.py b/tests/test_ec2/test_vpcs.py index ad17deb3c0a1..44222583d884 100644 --- a/tests/test_ec2/test_vpcs.py +++ b/tests/test_ec2/test_vpcs.py @@ -10,7 +10,8 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2, mock_ec2_deprecated +from moto import mock_ec2 +from moto import mock_ec2_deprecated SAMPLE_DOMAIN_NAME = u'example.com' SAMPLE_NAME_SERVERS = [u'10.0.0.6', u'10.0.0.7'] diff --git a/tests/test_ecs/test_ecs_boto3.py b/tests/test_ecs/test_ecs_boto3.py index 27f37308ee60..5f3d52193ac2 100644 --- a/tests/test_ecs/test_ecs_boto3.py +++ b/tests/test_ecs/test_ecs_boto3.py @@ -9,7 +9,8 @@ from moto.ec2 import utils as ec2_utils from uuid import UUID -from moto import mock_cloudformation, mock_elbv2 +from moto import mock_cloudformation +from moto import mock_elbv2 from moto import mock_ecs from moto import mock_ec2 from nose.tools import assert_raises diff --git a/tests/test_elb/test_elb.py b/tests/test_elb/test_elb.py index 447896f15419..11172daedb95 100644 --- a/tests/test_elb/test_elb.py +++ b/tests/test_elb/test_elb.py @@ -14,7 +14,10 @@ from nose.tools import assert_raises import sure # noqa -from moto import mock_elb, mock_ec2, mock_elb_deprecated, mock_ec2_deprecated +from moto import mock_elb +from moto import mock_ec2 +from moto import mock_elb_deprecated +from moto import mock_ec2_deprecated @mock_elb_deprecated diff --git a/tests/test_elbv2/test_elbv2.py b/tests/test_elbv2/test_elbv2.py index 879a04cd81ab..14f1975f5565 100644 --- a/tests/test_elbv2/test_elbv2.py +++ b/tests/test_elbv2/test_elbv2.py @@ -8,7 +8,10 @@ from nose.tools import assert_raises import sure # noqa -from moto import mock_elbv2, mock_ec2, mock_acm, mock_cloudformation +from moto import mock_elbv2 +from moto import mock_ec2 +from moto import mock_acm +from moto import mock_cloudformation from moto.elbv2 import elbv2_backends diff --git a/tests/test_iam/test_iam.py b/tests/test_iam/test_iam.py index e7507e2e5202..918d5ba223b8 100644 --- a/tests/test_iam/test_iam.py +++ b/tests/test_iam/test_iam.py @@ -9,7 +9,8 @@ import sys from boto.exception import BotoServerError from botocore.exceptions import ClientError -from moto import mock_iam, mock_iam_deprecated +from moto import mock_iam +from moto import mock_iam_deprecated from moto.iam.models import aws_managed_policies from nose.tools import assert_raises, assert_equals from nose.tools import raises diff --git a/tests/test_iam/test_iam_groups.py b/tests/test_iam/test_iam_groups.py index 1ca9f2512a4a..61356b5a1cc5 100644 --- a/tests/test_iam/test_iam_groups.py +++ b/tests/test_iam/test_iam_groups.py @@ -8,7 +8,8 @@ from nose.tools import assert_raises from boto.exception import BotoServerError -from moto import mock_iam, mock_iam_deprecated +from moto import mock_iam +from moto import mock_iam_deprecated MOCK_POLICY = """ { diff --git a/tests/test_iotdata/test_iotdata.py b/tests/test_iotdata/test_iotdata.py index 09c1ada4c68f..ba1a959ba3f8 100644 --- a/tests/test_iotdata/test_iotdata.py +++ b/tests/test_iotdata/test_iotdata.py @@ -5,7 +5,8 @@ import sure # noqa from nose.tools import assert_raises from botocore.exceptions import ClientError -from moto import mock_iotdata, mock_iot +from moto import mock_iotdata +from moto import mock_iot @mock_iot diff --git a/tests/test_kinesis/test_kinesis.py b/tests/test_kinesis/test_kinesis.py index e2de866fc28f..2e7908da4008 100644 --- a/tests/test_kinesis/test_kinesis.py +++ b/tests/test_kinesis/test_kinesis.py @@ -8,7 +8,8 @@ from boto.kinesis.exceptions import ResourceNotFoundException, \ InvalidArgumentException -from moto import mock_kinesis, mock_kinesis_deprecated +from moto import mock_kinesis +from moto import mock_kinesis_deprecated @mock_kinesis_deprecated diff --git a/tests/test_kms/test_kms.py b/tests/test_kms/test_kms.py index 8fe0620f1811..fb3047490575 100644 --- a/tests/test_kms/test_kms.py +++ b/tests/test_kms/test_kms.py @@ -8,7 +8,8 @@ from moto.kms.exceptions import NotFoundException as MotoNotFoundException import sure # noqa -from moto import mock_kms, mock_kms_deprecated +from moto import mock_kms +from moto import mock_kms_deprecated from nose.tools import assert_raises from freezegun import freeze_time from datetime import date diff --git a/tests/test_logs/test_logs.py b/tests/test_logs/test_logs.py index 7048061f0127..ee16b3a01ec0 100644 --- a/tests/test_logs/test_logs.py +++ b/tests/test_logs/test_logs.py @@ -3,7 +3,8 @@ import six from botocore.exceptions import ClientError -from moto import mock_logs, settings +from moto import mock_logs +from moto import settings from nose.tools import assert_raises _logs_region = 'us-east-1' if settings.TEST_SERVER_MODE else 'us-west-2' diff --git a/tests/test_rds/test_rds.py b/tests/test_rds/test_rds.py index af330e6724ff..b2925c786a09 100644 --- a/tests/test_rds/test_rds.py +++ b/tests/test_rds/test_rds.py @@ -6,7 +6,9 @@ from boto.exception import BotoServerError import sure # noqa -from moto import mock_ec2_deprecated, mock_rds_deprecated, mock_rds +from moto import mock_ec2_deprecated +from moto import mock_rds_deprecated +from moto import mock_rds from tests.helpers import disable_on_py3 diff --git a/tests/test_rds2/test_rds2.py b/tests/test_rds2/test_rds2.py index aacaf04f1b9f..2f1a8e976af1 100644 --- a/tests/test_rds2/test_rds2.py +++ b/tests/test_rds2/test_rds2.py @@ -3,7 +3,9 @@ from botocore.exceptions import ClientError, ParamValidationError import boto3 import sure # noqa -from moto import mock_ec2, mock_kms, mock_rds2 +from moto import mock_ec2 +from moto import mock_kms +from moto import mock_rds2 @mock_rds2 diff --git a/tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py b/tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py index 1e42dfe55608..626b449c523a 100644 --- a/tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py +++ b/tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py @@ -2,11 +2,11 @@ import boto3 import sure # noqa +from moto import mock_resourcegroupstaggingapi +from moto import mock_s3 from moto import mock_ec2 from moto import mock_elbv2 from moto import mock_kms -from moto import mock_resourcegroupstaggingapi -from moto import mock_s3 @mock_s3 @@ -255,7 +255,7 @@ def test_get_many_resources(): Scheme='internal', Tags=[ { - 'Key': 'key_name', + 'Key': 'key_name', 'Value': 'a_value' }, { @@ -276,7 +276,7 @@ def test_get_many_resources(): KeyUsage='ENCRYPT_DECRYPT', Tags=[ { - 'TagKey': 'key_name', + 'TagKey': 'key_name', 'TagValue': 'a_value' }, { diff --git a/tests/test_route53/test_route53.py b/tests/test_route53/test_route53.py index de9465d6d1b7..e105628a712b 100644 --- a/tests/test_route53/test_route53.py +++ b/tests/test_route53/test_route53.py @@ -12,7 +12,8 @@ import botocore from nose.tools import assert_raises -from moto import mock_route53, mock_route53_deprecated +from moto import mock_route53 +from moto import mock_route53_deprecated @mock_route53_deprecated diff --git a/tests/test_s3/test_s3.py b/tests/test_s3/test_s3.py index cd57fc92bb74..999de2af2d02 100644 --- a/tests/test_s3/test_s3.py +++ b/tests/test_s3/test_s3.py @@ -27,7 +27,9 @@ import sure # noqa -from moto import settings, mock_s3, mock_s3_deprecated +from moto import settings +from moto import mock_s3 +from moto import mock_s3_deprecated import moto.s3.models as s3model if settings.TEST_SERVER_MODE: diff --git a/tests/test_s3/test_s3_lifecycle.py b/tests/test_s3/test_s3_lifecycle.py index 3d533a641048..121c94783dbf 100644 --- a/tests/test_s3/test_s3_lifecycle.py +++ b/tests/test_s3/test_s3_lifecycle.py @@ -10,7 +10,8 @@ from datetime import datetime from nose.tools import assert_raises -from moto import mock_s3_deprecated, mock_s3 +from moto import mock_s3_deprecated +from moto import mock_s3 @mock_s3_deprecated diff --git a/tests/test_s3/test_s3_storageclass.py b/tests/test_s3/test_s3_storageclass.py index 99908c50139d..ef212784680f 100644 --- a/tests/test_s3/test_s3_storageclass.py +++ b/tests/test_s3/test_s3_storageclass.py @@ -10,7 +10,8 @@ from datetime import datetime from nose.tools import assert_raises -from moto import mock_s3_deprecated, mock_s3 +from moto import mock_s3_deprecated +from moto import mock_s3 @mock_s3 diff --git a/tests/test_s3bucket_path/test_s3bucket_path.py b/tests/test_s3bucket_path/test_s3bucket_path.py index 21d786c61f98..35d1e95a4035 100644 --- a/tests/test_s3bucket_path/test_s3bucket_path.py +++ b/tests/test_s3bucket_path/test_s3bucket_path.py @@ -12,7 +12,8 @@ import sure # noqa -from moto import mock_s3, mock_s3_deprecated +from moto import mock_s3 +from moto import mock_s3_deprecated def create_connection(key=None, secret=None): diff --git a/tests/test_sns/test_publishing.py b/tests/test_sns/test_publishing.py index 964296837cd5..98fea6082b82 100644 --- a/tests/test_sns/test_publishing.py +++ b/tests/test_sns/test_publishing.py @@ -6,7 +6,8 @@ from freezegun import freeze_time import sure # noqa -from moto import mock_sns_deprecated, mock_sqs_deprecated +from moto import mock_sns_deprecated +from moto import mock_sqs_deprecated MESSAGE_FROM_SQS_TEMPLATE = '{\n "Message": "%s",\n "MessageId": "%s",\n "Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",\n "SignatureVersion": "1",\n "SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",\n "Subject": "%s",\n "Timestamp": "2015-01-01T12:00:00.000Z",\n "TopicArn": "arn:aws:sns:%s:123456789012:some-topic",\n "Type": "Notification",\n "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:123456789012:some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55"\n}' diff --git a/tests/test_sns/test_publishing_boto3.py b/tests/test_sns/test_publishing_boto3.py index 3d598d40630a..8ac0acd6dc2f 100644 --- a/tests/test_sns/test_publishing_boto3.py +++ b/tests/test_sns/test_publishing_boto3.py @@ -11,7 +11,8 @@ import responses from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_sns, mock_sqs +from moto import mock_sns +from moto import mock_sqs MESSAGE_FROM_SQS_TEMPLATE = '{\n "Message": "%s",\n "MessageId": "%s",\n "Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",\n "SignatureVersion": "1",\n "SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",\n "Subject": "my subject",\n "Timestamp": "2015-01-01T12:00:00.000Z",\n "TopicArn": "arn:aws:sns:%s:123456789012:some-topic",\n "Type": "Notification",\n "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:123456789012:some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55"\n}' diff --git a/tests/test_sqs/test_sqs.py b/tests/test_sqs/test_sqs.py index d53ae50f76ce..c31145a2be89 100644 --- a/tests/test_sqs/test_sqs.py +++ b/tests/test_sqs/test_sqs.py @@ -16,7 +16,9 @@ import time import uuid -from moto import settings, mock_sqs, mock_sqs_deprecated +from moto import settings +from moto import mock_sqs +from moto import mock_sqs_deprecated from tests.helpers import requires_boto_gte import tests.backport_assert_raises # noqa from nose.tools import assert_raises diff --git a/tests/test_ssm/test_ssm_boto3.py b/tests/test_ssm/test_ssm_boto3.py index 77d439d831e2..b1cf25daa97b 100644 --- a/tests/test_ssm/test_ssm_boto3.py +++ b/tests/test_ssm/test_ssm_boto3.py @@ -10,7 +10,8 @@ from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_ssm, mock_cloudformation +from moto import mock_ssm +from moto import mock_cloudformation @mock_ssm diff --git a/tests/test_sts/test_sts.py b/tests/test_sts/test_sts.py index 7d3586f2c963..02b142ba3c85 100644 --- a/tests/test_sts/test_sts.py +++ b/tests/test_sts/test_sts.py @@ -8,7 +8,8 @@ from nose.tools import assert_raises import sure # noqa -from moto import mock_sts, mock_sts_deprecated +from moto import mock_sts +from moto import mock_sts_deprecated from moto.sts.responses import MAX_FEDERATION_TOKEN_POLICY_LENGTH diff --git a/tests/test_xray/test_xray_client.py b/tests/test_xray/test_xray_client.py index 0cd948950434..a30520bc89fe 100644 --- a/tests/test_xray/test_xray_client.py +++ b/tests/test_xray/test_xray_client.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals -from moto import mock_xray_client, XRaySegment, mock_dynamodb2 +from moto import mock_xray_client +from moto.xray import XRaySegment +from moto import mock_dynamodb2 import sure # noqa import boto3 From 7370a14f2e306b9864561135161a1286904a40cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Ehlert?= Date: Sat, 27 Jul 2019 12:52:11 +0200 Subject: [PATCH 2/9] Fix imports in tests --- tests/test_acm/test_acm.py | 2 +- tests/test_apigateway/test_apigateway.py | 2 +- tests/test_autoscaling/test_autoscaling.py | 12 ++--- tests/test_autoscaling/test_elbv2.py | 6 +-- .../test_launch_configurations.py | 4 +- tests/test_autoscaling/test_policies.py | 2 +- tests/test_autoscaling/utils.py | 4 +- tests/test_awslambda/test_lambda.py | 10 ++--- tests/test_batch/test_batch.py | 10 ++--- tests/test_batch/test_cloudformation.py | 12 ++--- tests/test_batch/test_server.py | 2 +- .../test_cloudformation_stack_crud.py | 6 +-- .../test_cloudformation_stack_crud_boto3.py | 8 ++-- .../test_cloudformation_stack_integration.py | 44 +++++++++---------- .../test_cloudformation/test_import_value.py | 2 +- tests/test_cloudformation/test_validate.py | 8 ++-- tests/test_cloudwatch/test_cloudwatch.py | 2 +- .../test_cloudwatch/test_cloudwatch_boto3.py | 2 +- .../test_cognitoidentity.py | 2 +- tests/test_cognitoidentity/test_server.py | 2 +- tests/test_cognitoidp/test_cognitoidp.py | 2 +- tests/test_core/test_decorator_calls.py | 4 +- tests/test_core/test_instance_metadata.py | 2 +- tests/test_core/test_moto_api.py | 2 +- tests/test_core/test_nested.py | 4 +- tests/test_datapipeline/test_datapipeline.py | 2 +- tests/test_datapipeline/test_server.py | 2 +- tests/test_dynamodb/test_dynamodb.py | 4 +- .../test_dynamodb_table_with_range_key.py | 2 +- .../test_dynamodb_table_without_range_key.py | 2 +- tests/test_dynamodb2/test_dynamodb.py | 4 +- .../test_dynamodb_table_with_range_key.py | 4 +- .../test_dynamodb_table_without_range_key.py | 4 +- .../test_dynamodbstreams.py | 4 +- tests/test_ec2/test_account_attributes.py | 2 +- tests/test_ec2/test_amazon_dev_pay.py | 2 +- tests/test_ec2/test_amis.py | 4 +- .../test_availability_zones_and_regions.py | 4 +- tests/test_ec2/test_customer_gateways.py | 2 +- tests/test_ec2/test_dhcp_options.py | 4 +- tests/test_ec2/test_elastic_block_store.py | 4 +- tests/test_ec2/test_elastic_ip_addresses.py | 4 +- .../test_elastic_network_interfaces.py | 6 +-- tests/test_ec2/test_general.py | 4 +- tests/test_ec2/test_instances.py | 4 +- tests/test_ec2/test_internet_gateways.py | 2 +- tests/test_ec2/test_ip_addresses.py | 2 +- tests/test_ec2/test_key_pairs.py | 2 +- tests/test_ec2/test_monitoring.py | 2 +- tests/test_ec2/test_nat_gateway.py | 2 +- tests/test_ec2/test_network_acls.py | 4 +- tests/test_ec2/test_placement_groups.py | 2 +- tests/test_ec2/test_regions.py | 6 +-- tests/test_ec2/test_reserved_instances.py | 2 +- tests/test_ec2/test_route_tables.py | 4 +- tests/test_ec2/test_security_groups.py | 4 +- tests/test_ec2/test_spot_fleet.py | 2 +- tests/test_ec2/test_spot_instances.py | 4 +- tests/test_ec2/test_subnets.py | 6 +-- tests/test_ec2/test_tags.py | 4 +- .../test_ec2/test_virtual_private_gateways.py | 2 +- tests/test_ec2/test_vm_export.py | 2 +- tests/test_ec2/test_vm_import.py | 2 +- tests/test_ec2/test_vpc_peering.py | 4 +- tests/test_ec2/test_vpcs.py | 4 +- tests/test_ec2/test_vpn_connections.py | 2 +- tests/test_ec2/test_windows.py | 2 +- tests/test_ecr/test_ecr_boto3.py | 2 +- tests/test_ecs/test_ecs_boto3.py | 8 ++-- tests/test_elb/test_elb.py | 8 ++-- tests/test_elbv2/test_elbv2.py | 8 ++-- tests/test_emr/test_emr.py | 2 +- tests/test_emr/test_emr_boto3.py | 2 +- tests/test_glacier/test_glacier_archives.py | 2 +- tests/test_glacier/test_glacier_jobs.py | 2 +- tests/test_glacier/test_glacier_server.py | 2 +- tests/test_glacier/test_glacier_vaults.py | 2 +- tests/test_glue/test_datacatalog.py | 2 +- tests/test_iam/test_iam.py | 4 +- tests/test_iam/test_iam_account_aliases.py | 2 +- tests/test_iam/test_iam_groups.py | 4 +- tests/test_iam/test_iam_policies.py | 2 +- tests/test_iot/test_iot.py | 2 +- tests/test_iot/test_server.py | 2 +- tests/test_iotdata/test_iotdata.py | 4 +- tests/test_iotdata/test_server.py | 2 +- tests/test_kinesis/test_firehose.py | 2 +- tests/test_kinesis/test_kinesis.py | 4 +- tests/test_kinesis/test_server.py | 2 +- tests/test_kms/test_kms.py | 4 +- tests/test_kms/test_server.py | 2 +- tests/test_logs/test_logs.py | 2 +- tests/test_opsworks/test_apps.py | 2 +- tests/test_opsworks/test_instances.py | 4 +- tests/test_opsworks/test_layers.py | 2 +- tests/test_opsworks/test_stack.py | 2 +- .../test_organizations_boto3.py | 2 +- tests/test_polly/test_polly.py | 2 +- tests/test_polly/test_server.py | 2 +- tests/test_rds/test_rds.py | 6 +-- tests/test_rds/test_server.py | 2 +- tests/test_rds2/test_rds2.py | 6 +-- tests/test_rds2/test_server.py | 2 +- tests/test_redshift/test_redshift.py | 8 ++-- tests/test_redshift/test_server.py | 2 +- .../test_resourcegroups.py | 2 +- .../test_resourcegroupstaggingapi.py | 10 ++--- tests/test_route53/test_route53.py | 4 +- tests/test_s3/test_s3.py | 4 +- tests/test_s3/test_s3_lifecycle.py | 4 +- tests/test_s3/test_s3_storageclass.py | 4 +- .../test_s3bucket_path/test_s3bucket_path.py | 4 +- .../test_s3bucket_path_combo.py | 2 +- .../test_secretsmanager.py | 2 +- tests/test_secretsmanager/test_server.py | 2 +- tests/test_ses/test_ses.py | 2 +- tests/test_ses/test_ses_boto3.py | 2 +- tests/test_sns/test_application.py | 2 +- tests/test_sns/test_application_boto3.py | 2 +- tests/test_sns/test_publishing.py | 4 +- tests/test_sns/test_publishing_boto3.py | 4 +- tests/test_sns/test_subscriptions.py | 2 +- tests/test_sns/test_subscriptions_boto3.py | 2 +- tests/test_sns/test_topics.py | 2 +- tests/test_sns/test_topics_boto3.py | 2 +- tests/test_sqs/test_sqs.py | 4 +- tests/test_ssm/test_ssm_boto3.py | 4 +- tests/test_sts/test_sts.py | 4 +- .../test_swf/responses/test_activity_tasks.py | 2 +- .../test_swf/responses/test_activity_types.py | 2 +- .../test_swf/responses/test_decision_tasks.py | 2 +- tests/test_swf/responses/test_domains.py | 2 +- tests/test_swf/responses/test_timeouts.py | 2 +- .../responses/test_workflow_executions.py | 2 +- .../test_swf/responses/test_workflow_types.py | 2 +- tests/test_xray/test_xray_boto3.py | 2 +- tests/test_xray/test_xray_client.py | 4 +- 137 files changed, 252 insertions(+), 252 deletions(-) diff --git a/tests/test_acm/test_acm.py b/tests/test_acm/test_acm.py index ccac481816cb..4e4a51cc45c8 100644 --- a/tests/test_acm/test_acm.py +++ b/tests/test_acm/test_acm.py @@ -8,7 +8,7 @@ from botocore.exceptions import ClientError -from moto import mock_acm +from moto.acm import mock_acm RESOURCE_FOLDER = os.path.join(os.path.dirname(__file__), 'resources') diff --git a/tests/test_apigateway/test_apigateway.py b/tests/test_apigateway/test_apigateway.py index ea571690e3db..4c450355ab30 100644 --- a/tests/test_apigateway/test_apigateway.py +++ b/tests/test_apigateway/test_apigateway.py @@ -8,7 +8,7 @@ from botocore.exceptions import ClientError import responses -from moto import mock_apigateway +from moto.apigateway import mock_apigateway from moto import settings diff --git a/tests/test_autoscaling/test_autoscaling.py b/tests/test_autoscaling/test_autoscaling.py index 5e11c7061bbb..e4e831c8ed79 100644 --- a/tests/test_autoscaling/test_autoscaling.py +++ b/tests/test_autoscaling/test_autoscaling.py @@ -10,12 +10,12 @@ from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_autoscaling -from moto import mock_ec2_deprecated -from moto import mock_elb_deprecated -from moto import mock_elb -from moto import mock_autoscaling_deprecated -from moto import mock_ec2 +from moto.autoscaling import mock_autoscaling +from moto.ec2 import mock_ec2_deprecated +from moto.elb import mock_elb_deprecated +from moto.elb import mock_elb +from moto.autoscaling import mock_autoscaling_deprecated +from moto.ec2 import mock_ec2 from tests.helpers import requires_boto_gte from utils import setup_networking, setup_networking_deprecated, setup_instance_with_networking diff --git a/tests/test_autoscaling/test_elbv2.py b/tests/test_autoscaling/test_elbv2.py index b5a43d08490d..fb3bf52a8ad3 100644 --- a/tests/test_autoscaling/test_elbv2.py +++ b/tests/test_autoscaling/test_elbv2.py @@ -2,9 +2,9 @@ import boto3 import sure # noqa -from moto import mock_autoscaling -from moto import mock_ec2 -from moto import mock_elbv2 +from moto.autoscaling import mock_autoscaling +from moto.ec2 import mock_ec2 +from moto.elbv2 import mock_elbv2 from utils import setup_networking diff --git a/tests/test_autoscaling/test_launch_configurations.py b/tests/test_autoscaling/test_launch_configurations.py index 931fc8a7ef01..ebf989ad4e7b 100644 --- a/tests/test_autoscaling/test_launch_configurations.py +++ b/tests/test_autoscaling/test_launch_configurations.py @@ -6,8 +6,8 @@ import sure # noqa -from moto import mock_autoscaling_deprecated -from moto import mock_autoscaling +from moto.autoscaling import mock_autoscaling_deprecated +from moto.autoscaling import mock_autoscaling from tests.helpers import requires_boto_gte diff --git a/tests/test_autoscaling/test_policies.py b/tests/test_autoscaling/test_policies.py index e6b01163fde0..e267aea15e5a 100644 --- a/tests/test_autoscaling/test_policies.py +++ b/tests/test_autoscaling/test_policies.py @@ -5,7 +5,7 @@ from boto.ec2.autoscale.policy import ScalingPolicy import sure # noqa -from moto import mock_autoscaling_deprecated +from moto.autoscaling import mock_autoscaling_deprecated from utils import setup_networking_deprecated diff --git a/tests/test_autoscaling/utils.py b/tests/test_autoscaling/utils.py index 5a8019cacf67..ee5fff539e25 100644 --- a/tests/test_autoscaling/utils.py +++ b/tests/test_autoscaling/utils.py @@ -1,8 +1,8 @@ import boto import boto3 from boto import vpc as boto_vpc -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated @mock_ec2 diff --git a/tests/test_awslambda/test_lambda.py b/tests/test_awslambda/test_lambda.py index 278b4da56170..37d7672c2018 100644 --- a/tests/test_awslambda/test_lambda.py +++ b/tests/test_awslambda/test_lambda.py @@ -11,11 +11,11 @@ import sure # noqa from freezegun import freeze_time -from moto import mock_lambda -from moto import mock_s3 -from moto import mock_ec2 -from moto import mock_sns -from moto import mock_logs +from moto.awslambda import mock_lambda +from moto.s3 import mock_s3 +from moto.ec2 import mock_ec2 +from moto.sns import mock_sns +from moto.logs import mock_logs from moto import settings from nose.tools import assert_raises from botocore.exceptions import ClientError diff --git a/tests/test_batch/test_batch.py b/tests/test_batch/test_batch.py index b9b2c0ee0a1a..45a6923dbea6 100644 --- a/tests/test_batch/test_batch.py +++ b/tests/test_batch/test_batch.py @@ -5,11 +5,11 @@ import boto3 from botocore.exceptions import ClientError import sure # noqa -from moto import mock_batch -from moto import mock_iam -from moto import mock_ec2 -from moto import mock_ecs -from moto import mock_logs +from moto.batch import mock_batch +from moto.iam import mock_iam +from moto.ec2 import mock_ec2 +from moto.ecs import mock_ecs +from moto.logs import mock_logs import functools import nose diff --git a/tests/test_batch/test_cloudformation.py b/tests/test_batch/test_cloudformation.py index e9a0eaafd73a..faa54b7716d2 100644 --- a/tests/test_batch/test_cloudformation.py +++ b/tests/test_batch/test_cloudformation.py @@ -5,12 +5,12 @@ import boto3 from botocore.exceptions import ClientError import sure # noqa -from moto import mock_batch -from moto import mock_iam -from moto import mock_ec2 -from moto import mock_ecs -from moto import mock_logs -from moto import mock_cloudformation +from moto.batch import mock_batch +from moto.iam import mock_iam +from moto.ec2 import mock_ec2 +from moto.ecs import mock_ecs +from moto.logs import mock_logs +from moto.cloudformation import mock_cloudformation import functools import nose import json diff --git a/tests/test_batch/test_server.py b/tests/test_batch/test_server.py index 4a74260a8b11..0216737e8239 100644 --- a/tests/test_batch/test_server.py +++ b/tests/test_batch/test_server.py @@ -3,7 +3,7 @@ import sure # noqa import moto.server as server -from moto import mock_batch +from moto.batch import mock_batch ''' Test the different server responses diff --git a/tests/test_cloudformation/test_cloudformation_stack_crud.py b/tests/test_cloudformation/test_cloudformation_stack_crud.py index 65984972f8e4..eb8de2abf573 100644 --- a/tests/test_cloudformation/test_cloudformation_stack_crud.py +++ b/tests/test_cloudformation/test_cloudformation_stack_crud.py @@ -13,9 +13,9 @@ import tests.backport_assert_raises # noqa from nose.tools import assert_raises -from moto import mock_cloudformation_deprecated -from moto import mock_s3_deprecated -from moto import mock_route53_deprecated +from moto.cloudformation import mock_cloudformation_deprecated +from moto.s3 import mock_s3_deprecated +from moto.route53 import mock_route53_deprecated from moto.cloudformation import cloudformation_backends dummy_template = { diff --git a/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py b/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py index 0570d257b385..c4332f06fd87 100644 --- a/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py +++ b/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py @@ -9,10 +9,10 @@ # Ensure 'assert_raises' context manager support for Python 2.6 from nose.tools import assert_raises -from moto import mock_cloudformation -from moto import mock_s3 -from moto import mock_sqs -from moto import mock_ec2 +from moto.cloudformation import mock_cloudformation +from moto.s3 import mock_s3 +from moto.sqs import mock_sqs +from moto.ec2 import mock_ec2 dummy_template = { "AWSTemplateFormatVersion": "2010-09-09", diff --git a/tests/test_cloudformation/test_cloudformation_stack_integration.py b/tests/test_cloudformation/test_cloudformation_stack_integration.py index 15a0d307e473..03cbef73ac99 100644 --- a/tests/test_cloudformation/test_cloudformation_stack_integration.py +++ b/tests/test_cloudformation/test_cloudformation_stack_integration.py @@ -19,28 +19,28 @@ import boto3 import sure # noqa -from moto import mock_autoscaling_deprecated -from moto import mock_cloudformation -from moto import mock_cloudformation_deprecated -from moto import mock_datapipeline_deprecated -from moto import mock_dynamodb2 -from moto import mock_ec2 -from moto import mock_ec2_deprecated -from moto import mock_elb -from moto import mock_elb_deprecated -from moto import mock_iam_deprecated -from moto import mock_kms -from moto import mock_lambda -from moto import mock_rds_deprecated -from moto import mock_rds2 -from moto import mock_rds2_deprecated -from moto import mock_redshift -from moto import mock_redshift_deprecated -from moto import mock_route53_deprecated -from moto import mock_sns_deprecated -from moto import mock_sqs -from moto import mock_sqs_deprecated -from moto import mock_elbv2 +from moto.autoscaling import mock_autoscaling_deprecated +from moto.cloudformation import mock_cloudformation +from moto.cloudformation import mock_cloudformation_deprecated +from moto.datapipeline import mock_datapipeline_deprecated +from moto.dynamodb2 import mock_dynamodb2 +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated +from moto.elb import mock_elb +from moto.elb import mock_elb_deprecated +from moto.iam import mock_iam_deprecated +from moto.kms import mock_kms +from moto.awslambda import mock_lambda +from moto.rds import mock_rds_deprecated +from moto.rds2 import mock_rds2 +from moto.rds2 import mock_rds2_deprecated +from moto.redshift import mock_redshift +from moto.redshift import mock_redshift_deprecated +from moto.route53 import mock_route53_deprecated +from moto.sns import mock_sns_deprecated +from moto.sqs import mock_sqs +from moto.sqs import mock_sqs_deprecated +from moto.elbv2 import mock_elbv2 from moto.dynamodb2.models import Table from .fixtures import ( diff --git a/tests/test_cloudformation/test_import_value.py b/tests/test_cloudformation/test_import_value.py index 04c2b580110e..e04b253495ea 100644 --- a/tests/test_cloudformation/test_import_value.py +++ b/tests/test_cloudformation/test_import_value.py @@ -9,7 +9,7 @@ from botocore.exceptions import ClientError # Package modules -from moto import mock_cloudformation +from moto.cloudformation import mock_cloudformation AWS_REGION = 'us-west-1' diff --git a/tests/test_cloudformation/test_validate.py b/tests/test_cloudformation/test_validate.py index ae224c608df4..106528bd15d4 100644 --- a/tests/test_cloudformation/test_validate.py +++ b/tests/test_cloudformation/test_validate.py @@ -14,10 +14,10 @@ from moto.s3.models import FakeBucket from moto.cloudformation.utils import yaml_tag_constructor from boto.cloudformation.stack import Output -from moto import mock_cloudformation -from moto import mock_s3 -from moto import mock_sqs -from moto import mock_ec2 +from moto.cloudformation import mock_cloudformation +from moto.s3 import mock_s3 +from moto.sqs import mock_sqs +from moto.ec2 import mock_ec2 json_template = { diff --git a/tests/test_cloudwatch/test_cloudwatch.py b/tests/test_cloudwatch/test_cloudwatch.py index a0f3871c065c..ad6d9af6cbc9 100644 --- a/tests/test_cloudwatch/test_cloudwatch.py +++ b/tests/test_cloudwatch/test_cloudwatch.py @@ -5,7 +5,7 @@ import pytz import sure # noqa -from moto import mock_cloudwatch_deprecated +from moto.cloudwatch import mock_cloudwatch_deprecated def alarm_fixture(name="tester", action=None): diff --git a/tests/test_cloudwatch/test_cloudwatch_boto3.py b/tests/test_cloudwatch/test_cloudwatch_boto3.py index 40b5eee08064..7ff2e9cda7ea 100755 --- a/tests/test_cloudwatch/test_cloudwatch_boto3.py +++ b/tests/test_cloudwatch/test_cloudwatch_boto3.py @@ -6,7 +6,7 @@ import pytz import sure # noqa -from moto import mock_cloudwatch +from moto.cloudwatch import mock_cloudwatch @mock_cloudwatch diff --git a/tests/test_cognitoidentity/test_cognitoidentity.py b/tests/test_cognitoidentity/test_cognitoidentity.py index ea9ccbc78a2c..fca1b2f44b83 100644 --- a/tests/test_cognitoidentity/test_cognitoidentity.py +++ b/tests/test_cognitoidentity/test_cognitoidentity.py @@ -2,7 +2,7 @@ import boto3 -from moto import mock_cognitoidentity +from moto.cognitoidentity import mock_cognitoidentity import sure # noqa from moto.cognitoidentity.utils import get_random_identity_id diff --git a/tests/test_cognitoidentity/test_server.py b/tests/test_cognitoidentity/test_server.py index b63d42bc0102..378d8f96e930 100644 --- a/tests/test_cognitoidentity/test_server.py +++ b/tests/test_cognitoidentity/test_server.py @@ -4,7 +4,7 @@ import sure # noqa import moto.server as server -from moto import mock_cognitoidentity +from moto.cognitoidentity import mock_cognitoidentity ''' Test the different server responses diff --git a/tests/test_cognitoidp/test_cognitoidp.py b/tests/test_cognitoidp/test_cognitoidp.py index 774ff7621328..ae8a4f40d332 100644 --- a/tests/test_cognitoidp/test_cognitoidp.py +++ b/tests/test_cognitoidp/test_cognitoidp.py @@ -12,7 +12,7 @@ from jose import jws from nose.tools import assert_raises -from moto import mock_cognitoidp +from moto.cognitoidp import mock_cognitoidp @mock_cognitoidp diff --git a/tests/test_core/test_decorator_calls.py b/tests/test_core/test_decorator_calls.py index e922faba2fb6..009da14e9df0 100644 --- a/tests/test_core/test_decorator_calls.py +++ b/tests/test_core/test_decorator_calls.py @@ -7,8 +7,8 @@ import tests.backport_assert_raises # noqa from nose.tools import assert_raises -from moto import mock_ec2_deprecated -from moto import mock_s3_deprecated +from moto.ec2 import mock_ec2_deprecated +from moto.s3 import mock_s3_deprecated ''' Test the different ways that the decorator can be used diff --git a/tests/test_core/test_instance_metadata.py b/tests/test_core/test_instance_metadata.py index 8b783a80c019..cdee5dce6c97 100644 --- a/tests/test_core/test_instance_metadata.py +++ b/tests/test_core/test_instance_metadata.py @@ -3,7 +3,7 @@ from nose.tools import assert_raises import requests -from moto import mock_ec2 +from moto.ec2 import mock_ec2 from moto import settings if settings.TEST_SERVER_MODE: diff --git a/tests/test_core/test_moto_api.py b/tests/test_core/test_moto_api.py index 000b518a83e0..bca5331bc741 100644 --- a/tests/test_core/test_moto_api.py +++ b/tests/test_core/test_moto_api.py @@ -4,7 +4,7 @@ import requests import boto3 -from moto import mock_sqs +from moto.sqs import mock_sqs from moto import settings base_url = "http://localhost:5000" if settings.TEST_SERVER_MODE else "http://motoapi.amazonaws.com" diff --git a/tests/test_core/test_nested.py b/tests/test_core/test_nested.py index 1a18d7eea401..29eb48fa1b48 100644 --- a/tests/test_core/test_nested.py +++ b/tests/test_core/test_nested.py @@ -5,8 +5,8 @@ from boto.sqs.message import Message from boto.ec2 import EC2Connection -from moto import mock_sqs_deprecated -from moto import mock_ec2_deprecated +from moto.sqs import mock_sqs_deprecated +from moto.ec2 import mock_ec2_deprecated class TestNestedDecorators(unittest.TestCase): diff --git a/tests/test_datapipeline/test_datapipeline.py b/tests/test_datapipeline/test_datapipeline.py index ce190c7e44af..9db91996c775 100644 --- a/tests/test_datapipeline/test_datapipeline.py +++ b/tests/test_datapipeline/test_datapipeline.py @@ -3,7 +3,7 @@ import boto.datapipeline import sure # noqa -from moto import mock_datapipeline_deprecated +from moto.datapipeline import mock_datapipeline_deprecated from moto.datapipeline.utils import remove_capitalization_of_dict_keys diff --git a/tests/test_datapipeline/test_server.py b/tests/test_datapipeline/test_server.py index 03c77b0344bc..94eb6925fa21 100644 --- a/tests/test_datapipeline/test_server.py +++ b/tests/test_datapipeline/test_server.py @@ -4,7 +4,7 @@ import sure # noqa import moto.server as server -from moto import mock_datapipeline +from moto.datapipeline import mock_datapipeline ''' Test the different server responses diff --git a/tests/test_dynamodb/test_dynamodb.py b/tests/test_dynamodb/test_dynamodb.py index 64f8631f948a..2ee31b592ca9 100644 --- a/tests/test_dynamodb/test_dynamodb.py +++ b/tests/test_dynamodb/test_dynamodb.py @@ -7,8 +7,8 @@ import tests.backport_assert_raises from nose.tools import assert_raises -from moto import mock_dynamodb -from moto import mock_dynamodb_deprecated +from moto.dynamodb import mock_dynamodb +from moto.dynamodb import mock_dynamodb_deprecated from moto.dynamodb import dynamodb_backend from boto.exception import DynamoDBResponseError diff --git a/tests/test_dynamodb/test_dynamodb_table_with_range_key.py b/tests/test_dynamodb/test_dynamodb_table_with_range_key.py index 2a482b31ec1f..19d07693c97d 100644 --- a/tests/test_dynamodb/test_dynamodb_table_with_range_key.py +++ b/tests/test_dynamodb/test_dynamodb_table_with_range_key.py @@ -4,7 +4,7 @@ import sure # noqa from freezegun import freeze_time -from moto import mock_dynamodb_deprecated +from moto.dynamodb import mock_dynamodb_deprecated from boto.dynamodb import condition from boto.dynamodb.exceptions import DynamoDBKeyNotFoundError, DynamoDBValidationError diff --git a/tests/test_dynamodb/test_dynamodb_table_without_range_key.py b/tests/test_dynamodb/test_dynamodb_table_without_range_key.py index ebd0c2051af3..9dc58f401a9a 100644 --- a/tests/test_dynamodb/test_dynamodb_table_without_range_key.py +++ b/tests/test_dynamodb/test_dynamodb_table_without_range_key.py @@ -4,7 +4,7 @@ import sure # noqa from freezegun import freeze_time -from moto import mock_dynamodb_deprecated +from moto.dynamodb import mock_dynamodb_deprecated from boto.dynamodb import condition from boto.dynamodb.exceptions import DynamoDBKeyNotFoundError diff --git a/tests/test_dynamodb2/test_dynamodb.py b/tests/test_dynamodb2/test_dynamodb.py index 1360d45367ec..fcbc2f3112ae 100644 --- a/tests/test_dynamodb2/test_dynamodb.py +++ b/tests/test_dynamodb2/test_dynamodb.py @@ -8,8 +8,8 @@ from boto3.dynamodb.conditions import Attr, Key import sure # noqa import requests -from moto import mock_dynamodb2 -from moto import mock_dynamodb2_deprecated +from moto.dynamodb2 import mock_dynamodb2 +from moto.dynamodb2 import mock_dynamodb2_deprecated from moto.dynamodb2 import dynamodb_backend2 from boto.exception import JSONResponseError from botocore.exceptions import ClientError diff --git a/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py b/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py index 949afa1c2196..56fde8c4b37d 100644 --- a/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py +++ b/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py @@ -8,8 +8,8 @@ from botocore.exceptions import ClientError import sure # noqa from freezegun import freeze_time -from moto import mock_dynamodb2 -from moto import mock_dynamodb2_deprecated +from moto.dynamodb2 import mock_dynamodb2 +from moto.dynamodb2 import mock_dynamodb2_deprecated from boto.exception import JSONResponseError from tests.helpers import requires_boto_gte try: diff --git a/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py b/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py index 0a0c033c7e0c..52406ee29a10 100644 --- a/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py +++ b/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py @@ -6,8 +6,8 @@ import sure # noqa from freezegun import freeze_time from boto.exception import JSONResponseError -from moto import mock_dynamodb2 -from moto import mock_dynamodb2_deprecated +from moto.dynamodb2 import mock_dynamodb2 +from moto.dynamodb2 import mock_dynamodb2_deprecated from tests.helpers import requires_boto_gte import botocore try: diff --git a/tests/test_dynamodbstreams/test_dynamodbstreams.py b/tests/test_dynamodbstreams/test_dynamodbstreams.py index 1be6954701e5..cb9009a4340d 100644 --- a/tests/test_dynamodbstreams/test_dynamodbstreams.py +++ b/tests/test_dynamodbstreams/test_dynamodbstreams.py @@ -3,8 +3,8 @@ from nose.tools import assert_raises import boto3 -from moto import mock_dynamodb2 -from moto import mock_dynamodbstreams +from moto.dynamodb2 import mock_dynamodb2 +from moto.dynamodbstreams import mock_dynamodbstreams class TestCore(): diff --git a/tests/test_ec2/test_account_attributes.py b/tests/test_ec2/test_account_attributes.py index 30309bec8ada..1af7bc476aff 100644 --- a/tests/test_ec2/test_account_attributes.py +++ b/tests/test_ec2/test_account_attributes.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals import boto3 -from moto import mock_ec2 +from moto.ec2 import mock_ec2 import sure # noqa diff --git a/tests/test_ec2/test_amazon_dev_pay.py b/tests/test_ec2/test_amazon_dev_pay.py index 38e1eb75197d..38735a914064 100644 --- a/tests/test_ec2/test_amazon_dev_pay.py +++ b/tests/test_ec2/test_amazon_dev_pay.py @@ -2,7 +2,7 @@ import boto import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 diff --git a/tests/test_ec2/test_amis.py b/tests/test_ec2/test_amis.py index a03e15bbb3a8..d3977d18ee04 100644 --- a/tests/test_ec2/test_amis.py +++ b/tests/test_ec2/test_amis.py @@ -9,8 +9,8 @@ from nose.tools import assert_raises import sure # noqa -from moto import mock_ec2_deprecated -from moto import mock_ec2 +from moto.ec2 import mock_ec2_deprecated +from moto.ec2 import mock_ec2 from moto.ec2.models import AMIS, OWNER_ID from tests.helpers import requires_boto_gte diff --git a/tests/test_ec2/test_availability_zones_and_regions.py b/tests/test_ec2/test_availability_zones_and_regions.py index 5971c6ba7618..2fcb156c38ef 100644 --- a/tests/test_ec2/test_availability_zones_and_regions.py +++ b/tests/test_ec2/test_availability_zones_and_regions.py @@ -4,8 +4,8 @@ import boto3 import sure # noqa -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated @mock_ec2_deprecated diff --git a/tests/test_ec2/test_customer_gateways.py b/tests/test_ec2/test_customer_gateways.py index 589f887f6f40..a132b0eeeaa3 100644 --- a/tests/test_ec2/test_customer_gateways.py +++ b/tests/test_ec2/test_customer_gateways.py @@ -5,7 +5,7 @@ from nose.tools import assert_false from boto.exception import EC2ResponseError -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2_deprecated @mock_ec2_deprecated diff --git a/tests/test_ec2/test_dhcp_options.py b/tests/test_ec2/test_dhcp_options.py index 8dbe9fab7e7a..5556a1d6e982 100644 --- a/tests/test_ec2/test_dhcp_options.py +++ b/tests/test_ec2/test_dhcp_options.py @@ -9,8 +9,8 @@ import sure # noqa -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated SAMPLE_DOMAIN_NAME = u'example.com' SAMPLE_NAME_SERVERS = [u'10.0.0.6', u'10.0.0.7'] diff --git a/tests/test_ec2/test_elastic_block_store.py b/tests/test_ec2/test_elastic_block_store.py index deec85641268..bf9c6b1dfb20 100644 --- a/tests/test_ec2/test_elastic_block_store.py +++ b/tests/test_ec2/test_elastic_block_store.py @@ -11,8 +11,8 @@ from freezegun import freeze_time import sure # noqa -from moto import mock_ec2_deprecated -from moto import mock_ec2 +from moto.ec2 import mock_ec2_deprecated +from moto.ec2 import mock_ec2 from moto.ec2.models import OWNER_ID diff --git a/tests/test_ec2/test_elastic_ip_addresses.py b/tests/test_ec2/test_elastic_ip_addresses.py index 8606da02ee06..702d1554986b 100644 --- a/tests/test_ec2/test_elastic_ip_addresses.py +++ b/tests/test_ec2/test_elastic_ip_addresses.py @@ -10,8 +10,8 @@ import sure # noqa -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated import logging diff --git a/tests/test_ec2/test_elastic_network_interfaces.py b/tests/test_ec2/test_elastic_network_interfaces.py index aaaf827e5394..f683ac93032d 100644 --- a/tests/test_ec2/test_elastic_network_interfaces.py +++ b/tests/test_ec2/test_elastic_network_interfaces.py @@ -11,9 +11,9 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2 -from moto import mock_cloudformation_deprecated -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.cloudformation import mock_cloudformation_deprecated +from moto.ec2 import mock_ec2_deprecated from tests.helpers import requires_boto_gte from tests.test_cloudformation.fixtures import vpc_eni import json diff --git a/tests/test_ec2/test_general.py b/tests/test_ec2/test_general.py index 950f8ed2364c..1de43539604b 100644 --- a/tests/test_ec2/test_general.py +++ b/tests/test_ec2/test_general.py @@ -8,8 +8,8 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2_deprecated -from moto import mock_ec2 +from moto.ec2 import mock_ec2_deprecated +from moto.ec2 import mock_ec2 @mock_ec2_deprecated diff --git a/tests/test_ec2/test_instances.py b/tests/test_ec2/test_instances.py index e6fb39ce78e4..f1dbce044863 100644 --- a/tests/test_ec2/test_instances.py +++ b/tests/test_ec2/test_instances.py @@ -17,8 +17,8 @@ from freezegun import freeze_time import sure # noqa -from moto import mock_ec2_deprecated -from moto import mock_ec2 +from moto.ec2 import mock_ec2_deprecated +from moto.ec2 import mock_ec2 from tests.helpers import requires_boto_gte diff --git a/tests/test_ec2/test_internet_gateways.py b/tests/test_ec2/test_internet_gateways.py index 3a1d0fda9cef..13a44bbf51e2 100644 --- a/tests/test_ec2/test_internet_gateways.py +++ b/tests/test_ec2/test_internet_gateways.py @@ -10,7 +10,7 @@ import sure # noqa -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2_deprecated VPC_CIDR = "10.0.0.0/16" diff --git a/tests/test_ec2/test_ip_addresses.py b/tests/test_ec2/test_ip_addresses.py index a8e927b004bc..e6d340ed86ec 100644 --- a/tests/test_ec2/test_ip_addresses.py +++ b/tests/test_ec2/test_ip_addresses.py @@ -2,7 +2,7 @@ import boto import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 diff --git a/tests/test_ec2/test_key_pairs.py b/tests/test_ec2/test_key_pairs.py index dfe6eabdf298..b4d4d9da4946 100644 --- a/tests/test_ec2/test_key_pairs.py +++ b/tests/test_ec2/test_key_pairs.py @@ -7,7 +7,7 @@ import sure # noqa from boto.exception import EC2ResponseError -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2_deprecated from .helpers import rsa_check_private_key diff --git a/tests/test_ec2/test_monitoring.py b/tests/test_ec2/test_monitoring.py index 03be93adf2d1..a06895388561 100644 --- a/tests/test_ec2/test_monitoring.py +++ b/tests/test_ec2/test_monitoring.py @@ -2,7 +2,7 @@ import boto import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 diff --git a/tests/test_ec2/test_nat_gateway.py b/tests/test_ec2/test_nat_gateway.py index 27e8753be1ad..3412f40660a0 100644 --- a/tests/test_ec2/test_nat_gateway.py +++ b/tests/test_ec2/test_nat_gateway.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import boto3 import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 diff --git a/tests/test_ec2/test_network_acls.py b/tests/test_ec2/test_network_acls.py index a034317d029a..89f5134de638 100644 --- a/tests/test_ec2/test_network_acls.py +++ b/tests/test_ec2/test_network_acls.py @@ -5,8 +5,8 @@ from nose.tools import assert_raises from botocore.exceptions import ClientError -from moto import mock_ec2_deprecated -from moto import mock_ec2 +from moto.ec2 import mock_ec2_deprecated +from moto.ec2 import mock_ec2 @mock_ec2_deprecated diff --git a/tests/test_ec2/test_placement_groups.py b/tests/test_ec2/test_placement_groups.py index c7494228a7da..3e8607bbe7ab 100644 --- a/tests/test_ec2/test_placement_groups.py +++ b/tests/test_ec2/test_placement_groups.py @@ -2,7 +2,7 @@ import boto import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 diff --git a/tests/test_ec2/test_regions.py b/tests/test_ec2/test_regions.py index c97caafb84af..627ba3b903b3 100644 --- a/tests/test_ec2/test_regions.py +++ b/tests/test_ec2/test_regions.py @@ -3,9 +3,9 @@ import boto.ec2.autoscale import boto.ec2.elb import sure -from moto import mock_ec2_deprecated -from moto import mock_autoscaling_deprecated -from moto import mock_elb_deprecated +from moto.ec2 import mock_ec2_deprecated +from moto.autoscaling import mock_autoscaling_deprecated +from moto.elb import mock_elb_deprecated from moto.ec2 import ec2_backends diff --git a/tests/test_ec2/test_reserved_instances.py b/tests/test_ec2/test_reserved_instances.py index 437d3a95b648..b362370015f6 100644 --- a/tests/test_ec2/test_reserved_instances.py +++ b/tests/test_ec2/test_reserved_instances.py @@ -2,7 +2,7 @@ import boto import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 diff --git a/tests/test_ec2/test_route_tables.py b/tests/test_ec2/test_route_tables.py index 202c0dbe48c6..1ad876e92f77 100644 --- a/tests/test_ec2/test_route_tables.py +++ b/tests/test_ec2/test_route_tables.py @@ -9,8 +9,8 @@ from botocore.exceptions import ClientError import sure # noqa -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated from tests.helpers import requires_boto_gte diff --git a/tests/test_ec2/test_security_groups.py b/tests/test_ec2/test_security_groups.py index 39aba044ec1d..a7300431f74a 100644 --- a/tests/test_ec2/test_security_groups.py +++ b/tests/test_ec2/test_security_groups.py @@ -12,8 +12,8 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated @mock_ec2_deprecated diff --git a/tests/test_ec2/test_spot_fleet.py b/tests/test_ec2/test_spot_fleet.py index 6221d633fcd1..5cd073ff3126 100644 --- a/tests/test_ec2/test_spot_fleet.py +++ b/tests/test_ec2/test_spot_fleet.py @@ -3,7 +3,7 @@ import boto3 import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 def get_subnet_id(conn): diff --git a/tests/test_ec2/test_spot_instances.py b/tests/test_ec2/test_spot_instances.py index ab42b59bcbbc..bb623509fb72 100644 --- a/tests/test_ec2/test_spot_instances.py +++ b/tests/test_ec2/test_spot_instances.py @@ -9,8 +9,8 @@ import pytz import sure # noqa -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated from moto.backends import get_model from moto.core.utils import iso_8601_datetime_with_milliseconds diff --git a/tests/test_ec2/test_subnets.py b/tests/test_ec2/test_subnets.py index 600e67b11b2a..b1e4845eb6e0 100644 --- a/tests/test_ec2/test_subnets.py +++ b/tests/test_ec2/test_subnets.py @@ -11,9 +11,9 @@ import json import sure # noqa -from moto import mock_cloudformation_deprecated -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.cloudformation import mock_cloudformation_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated @mock_ec2_deprecated diff --git a/tests/test_ec2/test_tags.py b/tests/test_ec2/test_tags.py index 5f4e75f56b70..d293369a81f8 100644 --- a/tests/test_ec2/test_tags.py +++ b/tests/test_ec2/test_tags.py @@ -10,8 +10,8 @@ from boto.ec2.instance import Reservation import sure # noqa -from moto import mock_ec2_deprecated -from moto import mock_ec2 +from moto.ec2 import mock_ec2_deprecated +from moto.ec2 import mock_ec2 from nose.tools import assert_raises diff --git a/tests/test_ec2/test_virtual_private_gateways.py b/tests/test_ec2/test_virtual_private_gateways.py index d90e97b452f1..bb5ff2c9e03e 100644 --- a/tests/test_ec2/test_virtual_private_gateways.py +++ b/tests/test_ec2/test_virtual_private_gateways.py @@ -2,7 +2,7 @@ import boto import sure # noqa -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2_deprecated @mock_ec2_deprecated diff --git a/tests/test_ec2/test_vm_export.py b/tests/test_ec2/test_vm_export.py index f8b24f6d452b..4cf3aa2129e7 100644 --- a/tests/test_ec2/test_vm_export.py +++ b/tests/test_ec2/test_vm_export.py @@ -2,7 +2,7 @@ import boto import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 diff --git a/tests/test_ec2/test_vm_import.py b/tests/test_ec2/test_vm_import.py index 66c7561a70a0..56bf560e00c5 100644 --- a/tests/test_ec2/test_vm_import.py +++ b/tests/test_ec2/test_vm_import.py @@ -2,7 +2,7 @@ import boto import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 diff --git a/tests/test_ec2/test_vpc_peering.py b/tests/test_ec2/test_vpc_peering.py index 4ab83d1d94f4..7e5a7a0d8f07 100644 --- a/tests/test_ec2/test_vpc_peering.py +++ b/tests/test_ec2/test_vpc_peering.py @@ -10,8 +10,8 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated from tests.helpers import requires_boto_gte diff --git a/tests/test_ec2/test_vpcs.py b/tests/test_ec2/test_vpcs.py index 44222583d884..ee49a3fd7ee1 100644 --- a/tests/test_ec2/test_vpcs.py +++ b/tests/test_ec2/test_vpcs.py @@ -10,8 +10,8 @@ from boto.exception import EC2ResponseError import sure # noqa -from moto import mock_ec2 -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated SAMPLE_DOMAIN_NAME = u'example.com' SAMPLE_NAME_SERVERS = [u'10.0.0.6', u'10.0.0.7'] diff --git a/tests/test_ec2/test_vpn_connections.py b/tests/test_ec2/test_vpn_connections.py index e95aa76ee65b..bdda67ab9ee4 100644 --- a/tests/test_ec2/test_vpn_connections.py +++ b/tests/test_ec2/test_vpn_connections.py @@ -4,7 +4,7 @@ import sure # noqa from boto.exception import EC2ResponseError -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2_deprecated @mock_ec2_deprecated diff --git a/tests/test_ec2/test_windows.py b/tests/test_ec2/test_windows.py index 364ac2f8a023..adfbd8c4e295 100644 --- a/tests/test_ec2/test_windows.py +++ b/tests/test_ec2/test_windows.py @@ -2,7 +2,7 @@ import boto import sure # noqa -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 diff --git a/tests/test_ecr/test_ecr_boto3.py b/tests/test_ecr/test_ecr_boto3.py index ec0e4e732dfd..1ddeeeb06669 100644 --- a/tests/test_ecr/test_ecr_boto3.py +++ b/tests/test_ecr/test_ecr_boto3.py @@ -14,7 +14,7 @@ from botocore.exceptions import ClientError, ParamValidationError from dateutil.tz import tzlocal -from moto import mock_ecr +from moto.ecr import mock_ecr from nose import SkipTest diff --git a/tests/test_ecs/test_ecs_boto3.py b/tests/test_ecs/test_ecs_boto3.py index 5f3d52193ac2..7edac7365f3c 100644 --- a/tests/test_ecs/test_ecs_boto3.py +++ b/tests/test_ecs/test_ecs_boto3.py @@ -9,10 +9,10 @@ from moto.ec2 import utils as ec2_utils from uuid import UUID -from moto import mock_cloudformation -from moto import mock_elbv2 -from moto import mock_ecs -from moto import mock_ec2 +from moto.cloudformation import mock_cloudformation +from moto.elbv2 import mock_elbv2 +from moto.ecs import mock_ecs +from moto.ec2 import mock_ec2 from nose.tools import assert_raises diff --git a/tests/test_elb/test_elb.py b/tests/test_elb/test_elb.py index 11172daedb95..95dab2721fda 100644 --- a/tests/test_elb/test_elb.py +++ b/tests/test_elb/test_elb.py @@ -14,10 +14,10 @@ from nose.tools import assert_raises import sure # noqa -from moto import mock_elb -from moto import mock_ec2 -from moto import mock_elb_deprecated -from moto import mock_ec2_deprecated +from moto.elb import mock_elb +from moto.ec2 import mock_ec2 +from moto.elb import mock_elb_deprecated +from moto.ec2 import mock_ec2_deprecated @mock_elb_deprecated diff --git a/tests/test_elbv2/test_elbv2.py b/tests/test_elbv2/test_elbv2.py index 14f1975f5565..e0cb6ddf8077 100644 --- a/tests/test_elbv2/test_elbv2.py +++ b/tests/test_elbv2/test_elbv2.py @@ -8,10 +8,10 @@ from nose.tools import assert_raises import sure # noqa -from moto import mock_elbv2 -from moto import mock_ec2 -from moto import mock_acm -from moto import mock_cloudformation +from moto.elbv2 import mock_elbv2 +from moto.ec2 import mock_ec2 +from moto.acm import mock_acm +from moto.cloudformation import mock_cloudformation from moto.elbv2 import elbv2_backends diff --git a/tests/test_emr/test_emr.py b/tests/test_emr/test_emr.py index 505c69b11ac2..49eb763f24cf 100644 --- a/tests/test_emr/test_emr.py +++ b/tests/test_emr/test_emr.py @@ -11,7 +11,7 @@ import six import sure # noqa -from moto import mock_emr_deprecated +from moto.emr import mock_emr_deprecated from tests.helpers import requires_boto_gte diff --git a/tests/test_emr/test_emr_boto3.py b/tests/test_emr/test_emr_boto3.py index b9a5025d90a9..3a2aa3bac059 100644 --- a/tests/test_emr/test_emr_boto3.py +++ b/tests/test_emr/test_emr_boto3.py @@ -11,7 +11,7 @@ from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_emr +from moto.emr import mock_emr run_job_flow_args = dict( diff --git a/tests/test_glacier/test_glacier_archives.py b/tests/test_glacier/test_glacier_archives.py index e8fa6045eba8..5dac6b773930 100644 --- a/tests/test_glacier/test_glacier_archives.py +++ b/tests/test_glacier/test_glacier_archives.py @@ -4,7 +4,7 @@ import boto.glacier import sure # noqa -from moto import mock_glacier_deprecated +from moto.glacier import mock_glacier_deprecated @mock_glacier_deprecated diff --git a/tests/test_glacier/test_glacier_jobs.py b/tests/test_glacier/test_glacier_jobs.py index 152aa14c8ebf..cd332ef8720b 100644 --- a/tests/test_glacier/test_glacier_jobs.py +++ b/tests/test_glacier/test_glacier_jobs.py @@ -6,7 +6,7 @@ from boto.glacier.layer1 import Layer1 import sure # noqa -from moto import mock_glacier_deprecated +from moto.glacier import mock_glacier_deprecated @mock_glacier_deprecated diff --git a/tests/test_glacier/test_glacier_server.py b/tests/test_glacier/test_glacier_server.py index fd803442130d..ee899ae04867 100644 --- a/tests/test_glacier/test_glacier_server.py +++ b/tests/test_glacier/test_glacier_server.py @@ -4,7 +4,7 @@ import sure # noqa import moto.server as server -from moto import mock_glacier +from moto.glacier import mock_glacier ''' Test the different server responses diff --git a/tests/test_glacier/test_glacier_vaults.py b/tests/test_glacier/test_glacier_vaults.py index e64f40a90d2b..3004860208b6 100644 --- a/tests/test_glacier/test_glacier_vaults.py +++ b/tests/test_glacier/test_glacier_vaults.py @@ -3,7 +3,7 @@ import boto.glacier import sure # noqa -from moto import mock_glacier_deprecated +from moto.glacier import mock_glacier_deprecated @mock_glacier_deprecated diff --git a/tests/test_glue/test_datacatalog.py b/tests/test_glue/test_datacatalog.py index 9034feb55167..4cd01c04d2a2 100644 --- a/tests/test_glue/test_datacatalog.py +++ b/tests/test_glue/test_datacatalog.py @@ -10,7 +10,7 @@ from datetime import datetime import pytz -from moto import mock_glue +from moto.glue import mock_glue from . import helpers diff --git a/tests/test_iam/test_iam.py b/tests/test_iam/test_iam.py index 918d5ba223b8..2814d9a78f3d 100644 --- a/tests/test_iam/test_iam.py +++ b/tests/test_iam/test_iam.py @@ -9,8 +9,8 @@ import sys from boto.exception import BotoServerError from botocore.exceptions import ClientError -from moto import mock_iam -from moto import mock_iam_deprecated +from moto.iam import mock_iam +from moto.iam import mock_iam_deprecated from moto.iam.models import aws_managed_policies from nose.tools import assert_raises, assert_equals from nose.tools import raises diff --git a/tests/test_iam/test_iam_account_aliases.py b/tests/test_iam/test_iam_account_aliases.py index 3d927038d1c6..b86ec95f151a 100644 --- a/tests/test_iam/test_iam_account_aliases.py +++ b/tests/test_iam/test_iam_account_aliases.py @@ -1,6 +1,6 @@ import boto3 import sure # noqa -from moto import mock_iam +from moto.iam import mock_iam @mock_iam() diff --git a/tests/test_iam/test_iam_groups.py b/tests/test_iam/test_iam_groups.py index 61356b5a1cc5..a3352a79a257 100644 --- a/tests/test_iam/test_iam_groups.py +++ b/tests/test_iam/test_iam_groups.py @@ -8,8 +8,8 @@ from nose.tools import assert_raises from boto.exception import BotoServerError -from moto import mock_iam -from moto import mock_iam_deprecated +from moto.iam import mock_iam +from moto.iam import mock_iam_deprecated MOCK_POLICY = """ { diff --git a/tests/test_iam/test_iam_policies.py b/tests/test_iam/test_iam_policies.py index e1924a559a62..be431d2b11bc 100644 --- a/tests/test_iam/test_iam_policies.py +++ b/tests/test_iam/test_iam_policies.py @@ -4,7 +4,7 @@ from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_iam +from moto.iam import mock_iam invalid_policy_document_test_cases = [ { diff --git a/tests/test_iot/test_iot.py b/tests/test_iot/test_iot.py index a580f56d17ab..b81d8accc8d3 100644 --- a/tests/test_iot/test_iot.py +++ b/tests/test_iot/test_iot.py @@ -4,7 +4,7 @@ import sure # noqa import boto3 -from moto import mock_iot +from moto.iot import mock_iot from botocore.exceptions import ClientError from nose.tools import assert_raises diff --git a/tests/test_iot/test_server.py b/tests/test_iot/test_server.py index 47091531a1f0..b85bfb6eb95f 100644 --- a/tests/test_iot/test_server.py +++ b/tests/test_iot/test_server.py @@ -3,7 +3,7 @@ import sure # noqa import moto.server as server -from moto import mock_iot +from moto.iot import mock_iot ''' Test the different server responses diff --git a/tests/test_iotdata/test_iotdata.py b/tests/test_iotdata/test_iotdata.py index ba1a959ba3f8..266114e9167e 100644 --- a/tests/test_iotdata/test_iotdata.py +++ b/tests/test_iotdata/test_iotdata.py @@ -5,8 +5,8 @@ import sure # noqa from nose.tools import assert_raises from botocore.exceptions import ClientError -from moto import mock_iotdata -from moto import mock_iot +from moto.iotdata import mock_iotdata +from moto.iot import mock_iot @mock_iot diff --git a/tests/test_iotdata/test_server.py b/tests/test_iotdata/test_server.py index 42a5c5f22a37..fc136de9339a 100644 --- a/tests/test_iotdata/test_server.py +++ b/tests/test_iotdata/test_server.py @@ -3,7 +3,7 @@ import sure # noqa import moto.server as server -from moto import mock_iotdata +from moto.iotdata import mock_iotdata ''' Test the different server responses diff --git a/tests/test_kinesis/test_firehose.py b/tests/test_kinesis/test_firehose.py index 6ab46c6f95d6..9703136cc669 100644 --- a/tests/test_kinesis/test_firehose.py +++ b/tests/test_kinesis/test_firehose.py @@ -6,7 +6,7 @@ import boto3 import sure # noqa -from moto import mock_kinesis +from moto.kinesis import mock_kinesis def create_stream(client, stream_name): diff --git a/tests/test_kinesis/test_kinesis.py b/tests/test_kinesis/test_kinesis.py index 2e7908da4008..d211123a07dd 100644 --- a/tests/test_kinesis/test_kinesis.py +++ b/tests/test_kinesis/test_kinesis.py @@ -8,8 +8,8 @@ from boto.kinesis.exceptions import ResourceNotFoundException, \ InvalidArgumentException -from moto import mock_kinesis -from moto import mock_kinesis_deprecated +from moto.kinesis import mock_kinesis +from moto.kinesis import mock_kinesis_deprecated @mock_kinesis_deprecated diff --git a/tests/test_kinesis/test_server.py b/tests/test_kinesis/test_server.py index 527310d752cd..29832d36b778 100644 --- a/tests/test_kinesis/test_server.py +++ b/tests/test_kinesis/test_server.py @@ -4,7 +4,7 @@ import sure # noqa import moto.server as server -from moto import mock_kinesis +from moto.kinesis import mock_kinesis ''' Test the different server responses diff --git a/tests/test_kms/test_kms.py b/tests/test_kms/test_kms.py index fb3047490575..83c3fc6b2c60 100644 --- a/tests/test_kms/test_kms.py +++ b/tests/test_kms/test_kms.py @@ -8,8 +8,8 @@ from moto.kms.exceptions import NotFoundException as MotoNotFoundException import sure # noqa -from moto import mock_kms -from moto import mock_kms_deprecated +from moto.kms import mock_kms +from moto.kms import mock_kms_deprecated from nose.tools import assert_raises from freezegun import freeze_time from datetime import date diff --git a/tests/test_kms/test_server.py b/tests/test_kms/test_server.py index 7b8f74e3bb94..472a46e4e8ba 100644 --- a/tests/test_kms/test_server.py +++ b/tests/test_kms/test_server.py @@ -4,7 +4,7 @@ import sure # noqa import moto.server as server -from moto import mock_kms +from moto.kms import mock_kms ''' Test the different server responses diff --git a/tests/test_logs/test_logs.py b/tests/test_logs/test_logs.py index ee16b3a01ec0..e60c90bf9d70 100644 --- a/tests/test_logs/test_logs.py +++ b/tests/test_logs/test_logs.py @@ -3,7 +3,7 @@ import six from botocore.exceptions import ClientError -from moto import mock_logs +from moto.logs import mock_logs from moto import settings from nose.tools import assert_raises diff --git a/tests/test_opsworks/test_apps.py b/tests/test_opsworks/test_apps.py index 37d0f2fe4736..f287c9c2b757 100644 --- a/tests/test_opsworks/test_apps.py +++ b/tests/test_opsworks/test_apps.py @@ -4,7 +4,7 @@ import sure # noqa import re -from moto import mock_opsworks +from moto.opsworks import mock_opsworks @freeze_time("2015-01-01") diff --git a/tests/test_opsworks/test_instances.py b/tests/test_opsworks/test_instances.py index f594a87c8c6b..a7e93583aa5e 100644 --- a/tests/test_opsworks/test_instances.py +++ b/tests/test_opsworks/test_instances.py @@ -2,8 +2,8 @@ import boto3 import sure # noqa -from moto import mock_opsworks -from moto import mock_ec2 +from moto.opsworks import mock_opsworks +from moto.ec2 import mock_ec2 @mock_opsworks diff --git a/tests/test_opsworks/test_layers.py b/tests/test_opsworks/test_layers.py index 9c640dfc352b..b3b438c19893 100644 --- a/tests/test_opsworks/test_layers.py +++ b/tests/test_opsworks/test_layers.py @@ -4,7 +4,7 @@ import sure # noqa import re -from moto import mock_opsworks +from moto.opsworks import mock_opsworks @freeze_time("2015-01-01") diff --git a/tests/test_opsworks/test_stack.py b/tests/test_opsworks/test_stack.py index 5913ce6d5e8f..42add19a051a 100644 --- a/tests/test_opsworks/test_stack.py +++ b/tests/test_opsworks/test_stack.py @@ -3,7 +3,7 @@ import sure # noqa import re -from moto import mock_opsworks +from moto.opsworks import mock_opsworks @mock_opsworks diff --git a/tests/test_organizations/test_organizations_boto3.py b/tests/test_organizations/test_organizations_boto3.py index 05f831e6277d..cc78c6a094ad 100644 --- a/tests/test_organizations/test_organizations_boto3.py +++ b/tests/test_organizations/test_organizations_boto3.py @@ -7,7 +7,7 @@ from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_organizations +from moto.organizations import mock_organizations from moto.organizations import utils from .organizations_test_utils import ( validate_organization, diff --git a/tests/test_polly/test_polly.py b/tests/test_polly/test_polly.py index c5c864835cfa..b51ceddb509d 100644 --- a/tests/test_polly/test_polly.py +++ b/tests/test_polly/test_polly.py @@ -4,7 +4,7 @@ import boto3 import sure # noqa from nose.tools import assert_raises -from moto import mock_polly +from moto.polly import mock_polly # Polly only available in a few regions DEFAULT_REGION = 'eu-west-1' diff --git a/tests/test_polly/test_server.py b/tests/test_polly/test_server.py index 3ae7f225422a..5a129aa39e8a 100644 --- a/tests/test_polly/test_server.py +++ b/tests/test_polly/test_server.py @@ -3,7 +3,7 @@ import sure # noqa import moto.server as server -from moto import mock_polly +from moto.polly import mock_polly ''' Test the different server responses diff --git a/tests/test_rds/test_rds.py b/tests/test_rds/test_rds.py index b2925c786a09..fa5ac2b2d915 100644 --- a/tests/test_rds/test_rds.py +++ b/tests/test_rds/test_rds.py @@ -6,9 +6,9 @@ from boto.exception import BotoServerError import sure # noqa -from moto import mock_ec2_deprecated -from moto import mock_rds_deprecated -from moto import mock_rds +from moto.ec2 import mock_ec2_deprecated +from moto.rds import mock_rds_deprecated +from moto.rds import mock_rds from tests.helpers import disable_on_py3 diff --git a/tests/test_rds/test_server.py b/tests/test_rds/test_server.py index 224704a0b2f8..1738aee062a5 100644 --- a/tests/test_rds/test_server.py +++ b/tests/test_rds/test_server.py @@ -3,7 +3,7 @@ import sure # noqa import moto.server as server -from moto import mock_rds +from moto.rds import mock_rds ''' Test the different server responses diff --git a/tests/test_rds2/test_rds2.py b/tests/test_rds2/test_rds2.py index 2f1a8e976af1..697fb7ebe512 100644 --- a/tests/test_rds2/test_rds2.py +++ b/tests/test_rds2/test_rds2.py @@ -3,9 +3,9 @@ from botocore.exceptions import ClientError, ParamValidationError import boto3 import sure # noqa -from moto import mock_ec2 -from moto import mock_kms -from moto import mock_rds2 +from moto.ec2 import mock_ec2 +from moto.kms import mock_kms +from moto.rds2 import mock_rds2 @mock_rds2 diff --git a/tests/test_rds2/test_server.py b/tests/test_rds2/test_server.py index f9489e054b4f..9ca9d2dc5d93 100644 --- a/tests/test_rds2/test_server.py +++ b/tests/test_rds2/test_server.py @@ -3,7 +3,7 @@ import sure # noqa import moto.server as server -from moto import mock_rds2 +from moto.rds2 import mock_rds2 ''' Test the different server responses diff --git a/tests/test_redshift/test_redshift.py b/tests/test_redshift/test_redshift.py index 541614788a42..84740605cf6b 100644 --- a/tests/test_redshift/test_redshift.py +++ b/tests/test_redshift/test_redshift.py @@ -16,10 +16,10 @@ ) import sure # noqa -from moto import mock_ec2 -from moto import mock_ec2_deprecated -from moto import mock_redshift -from moto import mock_redshift_deprecated +from moto.ec2 import mock_ec2 +from moto.ec2 import mock_ec2_deprecated +from moto.redshift import mock_redshift +from moto.redshift import mock_redshift_deprecated @mock_redshift diff --git a/tests/test_redshift/test_server.py b/tests/test_redshift/test_server.py index c37e9cab77b9..1830948c7e1f 100644 --- a/tests/test_redshift/test_server.py +++ b/tests/test_redshift/test_server.py @@ -4,7 +4,7 @@ import sure # noqa import moto.server as server -from moto import mock_redshift +from moto.redshift import mock_redshift ''' Test the different server responses diff --git a/tests/test_resourcegroups/test_resourcegroups.py b/tests/test_resourcegroups/test_resourcegroups.py index bb3624413ea9..737257269fb1 100644 --- a/tests/test_resourcegroups/test_resourcegroups.py +++ b/tests/test_resourcegroups/test_resourcegroups.py @@ -4,7 +4,7 @@ import json import sure # noqa -from moto import mock_resourcegroups +from moto.resourcegroups import mock_resourcegroups @mock_resourcegroups diff --git a/tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py b/tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py index 626b449c523a..5e24d9b29416 100644 --- a/tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py +++ b/tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py @@ -2,11 +2,11 @@ import boto3 import sure # noqa -from moto import mock_resourcegroupstaggingapi -from moto import mock_s3 -from moto import mock_ec2 -from moto import mock_elbv2 -from moto import mock_kms +from moto.resourcegroupstaggingapi import mock_resourcegroupstaggingapi +from moto.s3 import mock_s3 +from moto.ec2 import mock_ec2 +from moto.elbv2 import mock_elbv2 +from moto.kms import mock_kms @mock_s3 diff --git a/tests/test_route53/test_route53.py b/tests/test_route53/test_route53.py index e105628a712b..bbd5c070a9ea 100644 --- a/tests/test_route53/test_route53.py +++ b/tests/test_route53/test_route53.py @@ -12,8 +12,8 @@ import botocore from nose.tools import assert_raises -from moto import mock_route53 -from moto import mock_route53_deprecated +from moto.route53 import mock_route53 +from moto.route53 import mock_route53_deprecated @mock_route53_deprecated diff --git a/tests/test_s3/test_s3.py b/tests/test_s3/test_s3.py index 999de2af2d02..6682a9efec7c 100644 --- a/tests/test_s3/test_s3.py +++ b/tests/test_s3/test_s3.py @@ -28,8 +28,8 @@ import sure # noqa from moto import settings -from moto import mock_s3 -from moto import mock_s3_deprecated +from moto.s3 import mock_s3 +from moto.s3 import mock_s3_deprecated import moto.s3.models as s3model if settings.TEST_SERVER_MODE: diff --git a/tests/test_s3/test_s3_lifecycle.py b/tests/test_s3/test_s3_lifecycle.py index 121c94783dbf..c502e0b4eff3 100644 --- a/tests/test_s3/test_s3_lifecycle.py +++ b/tests/test_s3/test_s3_lifecycle.py @@ -10,8 +10,8 @@ from datetime import datetime from nose.tools import assert_raises -from moto import mock_s3_deprecated -from moto import mock_s3 +from moto.s3 import mock_s3_deprecated +from moto.s3 import mock_s3 @mock_s3_deprecated diff --git a/tests/test_s3/test_s3_storageclass.py b/tests/test_s3/test_s3_storageclass.py index ef212784680f..79869086fd0f 100644 --- a/tests/test_s3/test_s3_storageclass.py +++ b/tests/test_s3/test_s3_storageclass.py @@ -10,8 +10,8 @@ from datetime import datetime from nose.tools import assert_raises -from moto import mock_s3_deprecated -from moto import mock_s3 +from moto.s3 import mock_s3_deprecated +from moto.s3 import mock_s3 @mock_s3 diff --git a/tests/test_s3bucket_path/test_s3bucket_path.py b/tests/test_s3bucket_path/test_s3bucket_path.py index 35d1e95a4035..775b73979957 100644 --- a/tests/test_s3bucket_path/test_s3bucket_path.py +++ b/tests/test_s3bucket_path/test_s3bucket_path.py @@ -12,8 +12,8 @@ import sure # noqa -from moto import mock_s3 -from moto import mock_s3_deprecated +from moto.s3 import mock_s3 +from moto.s3 import mock_s3_deprecated def create_connection(key=None, secret=None): diff --git a/tests/test_s3bucket_path/test_s3bucket_path_combo.py b/tests/test_s3bucket_path/test_s3bucket_path_combo.py index e1b1075ee0d3..41e04c4b7978 100644 --- a/tests/test_s3bucket_path/test_s3bucket_path_combo.py +++ b/tests/test_s3bucket_path/test_s3bucket_path_combo.py @@ -3,7 +3,7 @@ import boto from boto.s3.connection import OrdinaryCallingFormat -from moto import mock_s3_deprecated +from moto.s3 import mock_s3_deprecated def create_connection(key=None, secret=None): diff --git a/tests/test_secretsmanager/test_secretsmanager.py b/tests/test_secretsmanager/test_secretsmanager.py index 78b95ee6a252..b70ad2a7a44b 100644 --- a/tests/test_secretsmanager/test_secretsmanager.py +++ b/tests/test_secretsmanager/test_secretsmanager.py @@ -2,7 +2,7 @@ import boto3 -from moto import mock_secretsmanager +from moto.secretsmanager import mock_secretsmanager from botocore.exceptions import ClientError import string import unittest diff --git a/tests/test_secretsmanager/test_server.py b/tests/test_secretsmanager/test_server.py index 23d8232394b8..8fa765c5ba7f 100644 --- a/tests/test_secretsmanager/test_server.py +++ b/tests/test_secretsmanager/test_server.py @@ -4,7 +4,7 @@ import sure # noqa import moto.server as server -from moto import mock_secretsmanager +from moto.secretsmanager import mock_secretsmanager ''' Test the different server responses for secretsmanager diff --git a/tests/test_ses/test_ses.py b/tests/test_ses/test_ses.py index 431d42e1d1e8..bb83995dc20e 100644 --- a/tests/test_ses/test_ses.py +++ b/tests/test_ses/test_ses.py @@ -6,7 +6,7 @@ import sure # noqa -from moto import mock_ses_deprecated +from moto.ses import mock_ses_deprecated @mock_ses_deprecated diff --git a/tests/test_ses/test_ses_boto3.py b/tests/test_ses/test_ses_boto3.py index e800b80350a4..b97537448204 100644 --- a/tests/test_ses/test_ses_boto3.py +++ b/tests/test_ses/test_ses_boto3.py @@ -7,7 +7,7 @@ import sure # noqa -from moto import mock_ses +from moto.ses import mock_ses @mock_ses diff --git a/tests/test_sns/test_application.py b/tests/test_sns/test_application.py index 319e4a6f86a8..03fefc36202f 100644 --- a/tests/test_sns/test_application.py +++ b/tests/test_sns/test_application.py @@ -2,7 +2,7 @@ import boto from boto.exception import BotoServerError -from moto import mock_sns_deprecated +from moto.sns import mock_sns_deprecated import sure # noqa diff --git a/tests/test_sns/test_application_boto3.py b/tests/test_sns/test_application_boto3.py index 1c9695fea274..04aa1ec34993 100644 --- a/tests/test_sns/test_application_boto3.py +++ b/tests/test_sns/test_application_boto3.py @@ -2,7 +2,7 @@ import boto3 from botocore.exceptions import ClientError -from moto import mock_sns +from moto.sns import mock_sns import sure # noqa diff --git a/tests/test_sns/test_publishing.py b/tests/test_sns/test_publishing.py index 98fea6082b82..81e10a64bd82 100644 --- a/tests/test_sns/test_publishing.py +++ b/tests/test_sns/test_publishing.py @@ -6,8 +6,8 @@ from freezegun import freeze_time import sure # noqa -from moto import mock_sns_deprecated -from moto import mock_sqs_deprecated +from moto.sns import mock_sns_deprecated +from moto.sqs import mock_sqs_deprecated MESSAGE_FROM_SQS_TEMPLATE = '{\n "Message": "%s",\n "MessageId": "%s",\n "Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",\n "SignatureVersion": "1",\n "SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",\n "Subject": "%s",\n "Timestamp": "2015-01-01T12:00:00.000Z",\n "TopicArn": "arn:aws:sns:%s:123456789012:some-topic",\n "Type": "Notification",\n "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:123456789012:some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55"\n}' diff --git a/tests/test_sns/test_publishing_boto3.py b/tests/test_sns/test_publishing_boto3.py index 8ac0acd6dc2f..64d62fb1736d 100644 --- a/tests/test_sns/test_publishing_boto3.py +++ b/tests/test_sns/test_publishing_boto3.py @@ -11,8 +11,8 @@ import responses from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_sns -from moto import mock_sqs +from moto.sns import mock_sns +from moto.sqs import mock_sqs MESSAGE_FROM_SQS_TEMPLATE = '{\n "Message": "%s",\n "MessageId": "%s",\n "Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",\n "SignatureVersion": "1",\n "SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",\n "Subject": "my subject",\n "Timestamp": "2015-01-01T12:00:00.000Z",\n "TopicArn": "arn:aws:sns:%s:123456789012:some-topic",\n "Type": "Notification",\n "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:123456789012:some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55"\n}' diff --git a/tests/test_sns/test_subscriptions.py b/tests/test_sns/test_subscriptions.py index ba241ba444a4..33f1be4da7c8 100644 --- a/tests/test_sns/test_subscriptions.py +++ b/tests/test_sns/test_subscriptions.py @@ -3,7 +3,7 @@ import sure # noqa -from moto import mock_sns_deprecated +from moto.sns import mock_sns_deprecated from moto.sns.models import DEFAULT_PAGE_SIZE diff --git a/tests/test_sns/test_subscriptions_boto3.py b/tests/test_sns/test_subscriptions_boto3.py index 2a56c8213570..8bf69a4e683d 100644 --- a/tests/test_sns/test_subscriptions_boto3.py +++ b/tests/test_sns/test_subscriptions_boto3.py @@ -7,7 +7,7 @@ from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_sns +from moto.sns import mock_sns from moto.sns.models import DEFAULT_PAGE_SIZE diff --git a/tests/test_sns/test_topics.py b/tests/test_sns/test_topics.py index 1b039c51d611..4b06ab8bf904 100644 --- a/tests/test_sns/test_topics.py +++ b/tests/test_sns/test_topics.py @@ -6,7 +6,7 @@ import sure # noqa from boto.exception import BotoServerError -from moto import mock_sns_deprecated +from moto.sns import mock_sns_deprecated from moto.sns.models import DEFAULT_TOPIC_POLICY, DEFAULT_EFFECTIVE_DELIVERY_POLICY, DEFAULT_PAGE_SIZE diff --git a/tests/test_sns/test_topics_boto3.py b/tests/test_sns/test_topics_boto3.py index 870fa6f6edc3..a224b8b8dbed 100644 --- a/tests/test_sns/test_topics_boto3.py +++ b/tests/test_sns/test_topics_boto3.py @@ -6,7 +6,7 @@ import sure # noqa from botocore.exceptions import ClientError -from moto import mock_sns +from moto.sns import mock_sns from moto.sns.models import DEFAULT_TOPIC_POLICY, DEFAULT_EFFECTIVE_DELIVERY_POLICY, DEFAULT_PAGE_SIZE diff --git a/tests/test_sqs/test_sqs.py b/tests/test_sqs/test_sqs.py index c31145a2be89..2579d6c0bdc6 100644 --- a/tests/test_sqs/test_sqs.py +++ b/tests/test_sqs/test_sqs.py @@ -17,8 +17,8 @@ import uuid from moto import settings -from moto import mock_sqs -from moto import mock_sqs_deprecated +from moto.sqs import mock_sqs +from moto.sqs import mock_sqs_deprecated from tests.helpers import requires_boto_gte import tests.backport_assert_raises # noqa from nose.tools import assert_raises diff --git a/tests/test_ssm/test_ssm_boto3.py b/tests/test_ssm/test_ssm_boto3.py index b1cf25daa97b..19bb25749d38 100644 --- a/tests/test_ssm/test_ssm_boto3.py +++ b/tests/test_ssm/test_ssm_boto3.py @@ -10,8 +10,8 @@ from botocore.exceptions import ClientError from nose.tools import assert_raises -from moto import mock_ssm -from moto import mock_cloudformation +from moto.ssm import mock_ssm +from moto.cloudformation import mock_cloudformation @mock_ssm diff --git a/tests/test_sts/test_sts.py b/tests/test_sts/test_sts.py index 02b142ba3c85..123b301a7d08 100644 --- a/tests/test_sts/test_sts.py +++ b/tests/test_sts/test_sts.py @@ -8,8 +8,8 @@ from nose.tools import assert_raises import sure # noqa -from moto import mock_sts -from moto import mock_sts_deprecated +from moto.sts import mock_sts +from moto.sts import mock_sts_deprecated from moto.sts.responses import MAX_FEDERATION_TOKEN_POLICY_LENGTH diff --git a/tests/test_swf/responses/test_activity_tasks.py b/tests/test_swf/responses/test_activity_tasks.py index c0b8897b9ed0..f2931af739d0 100644 --- a/tests/test_swf/responses/test_activity_tasks.py +++ b/tests/test_swf/responses/test_activity_tasks.py @@ -2,7 +2,7 @@ from freezegun import freeze_time import sure # noqa -from moto import mock_swf_deprecated +from moto.swf import mock_swf_deprecated from moto.swf import swf_backend from ..utils import setup_workflow, SCHEDULE_ACTIVITY_TASK_DECISION diff --git a/tests/test_swf/responses/test_activity_types.py b/tests/test_swf/responses/test_activity_types.py index 95d8a37337d8..d5043c19f724 100644 --- a/tests/test_swf/responses/test_activity_types.py +++ b/tests/test_swf/responses/test_activity_types.py @@ -2,7 +2,7 @@ from boto.swf.exceptions import SWFResponseError import sure # noqa -from moto import mock_swf_deprecated +from moto.swf import mock_swf_deprecated # RegisterActivityType endpoint diff --git a/tests/test_swf/responses/test_decision_tasks.py b/tests/test_swf/responses/test_decision_tasks.py index 972b1053b77d..4f179c676363 100644 --- a/tests/test_swf/responses/test_decision_tasks.py +++ b/tests/test_swf/responses/test_decision_tasks.py @@ -2,7 +2,7 @@ from freezegun import freeze_time import sure # noqa -from moto import mock_swf_deprecated +from moto.swf import mock_swf_deprecated from moto.swf import swf_backend from ..utils import setup_workflow diff --git a/tests/test_swf/responses/test_domains.py b/tests/test_swf/responses/test_domains.py index 8edc76432ef3..7ce66199a13a 100644 --- a/tests/test_swf/responses/test_domains.py +++ b/tests/test_swf/responses/test_domains.py @@ -2,7 +2,7 @@ from boto.swf.exceptions import SWFResponseError import sure # noqa -from moto import mock_swf_deprecated +from moto.swf import mock_swf_deprecated # RegisterDomain endpoint diff --git a/tests/test_swf/responses/test_timeouts.py b/tests/test_swf/responses/test_timeouts.py index f49c597a4dd7..f4543e793d3a 100644 --- a/tests/test_swf/responses/test_timeouts.py +++ b/tests/test_swf/responses/test_timeouts.py @@ -1,7 +1,7 @@ from freezegun import freeze_time import sure # noqa -from moto import mock_swf_deprecated +from moto.swf import mock_swf_deprecated from ..utils import setup_workflow, SCHEDULE_ACTIVITY_TASK_DECISION diff --git a/tests/test_swf/responses/test_workflow_executions.py b/tests/test_swf/responses/test_workflow_executions.py index 88e3caa75c6f..4ca577f6b0cd 100644 --- a/tests/test_swf/responses/test_workflow_executions.py +++ b/tests/test_swf/responses/test_workflow_executions.py @@ -6,7 +6,7 @@ # Ensure 'assert_raises' context manager support for Python 2.6 import tests.backport_assert_raises # noqa -from moto import mock_swf_deprecated +from moto.swf import mock_swf_deprecated from moto.core.utils import unix_time diff --git a/tests/test_swf/responses/test_workflow_types.py b/tests/test_swf/responses/test_workflow_types.py index 9e097a873f00..afe75f41af07 100644 --- a/tests/test_swf/responses/test_workflow_types.py +++ b/tests/test_swf/responses/test_workflow_types.py @@ -1,7 +1,7 @@ import sure import boto -from moto import mock_swf_deprecated +from moto.swf import mock_swf_deprecated from boto.swf.exceptions import SWFResponseError diff --git a/tests/test_xray/test_xray_boto3.py b/tests/test_xray/test_xray_boto3.py index 5ad8f8bc7b75..ad4e2dca4947 100644 --- a/tests/test_xray/test_xray_boto3.py +++ b/tests/test_xray/test_xray_boto3.py @@ -5,7 +5,7 @@ import botocore.exceptions import sure # noqa -from moto import mock_xray +from moto.xray import mock_xray import datetime diff --git a/tests/test_xray/test_xray_client.py b/tests/test_xray/test_xray_client.py index a30520bc89fe..d80842e183d7 100644 --- a/tests/test_xray/test_xray_client.py +++ b/tests/test_xray/test_xray_client.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from moto import mock_xray_client +from moto.xray import mock_xray_client from moto.xray import XRaySegment -from moto import mock_dynamodb2 +from moto.dynamodb2 import mock_dynamodb2 import sure # noqa import boto3 From 23774e92fb09e689a4c404deb0544832f0bf9124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Ehlert?= Date: Sat, 27 Jul 2019 12:52:19 +0200 Subject: [PATCH 3/9] Fix import in docs and README --- README.md | 10 +++++----- docs/_build/html/_sources/docs/getting_started.rst.txt | 2 +- docs/_build/html/_sources/getting_started.rst.txt | 2 +- docs/_build/html/_sources/getting_started.txt | 2 +- docs/docs/getting_started.rst | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5a1d7f1f1bd4..c551baf6007c 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Now see how you could test it with Moto: ```python import boto3 -from moto import mock_s3 +from moto.s3 import mock_s3 from mymodule import MyModel @@ -168,7 +168,7 @@ To test it: ```python from . import add_servers -from moto import mock_ec2 +from moto.ec2 import mock_ec2 @mock_ec2 def test_add_servers(): @@ -186,7 +186,7 @@ moto 1.0.X mock decorators are defined for boto3 and do not work with boto2. Use Using moto with boto2 ```python -from moto import mock_ec2_deprecated +from moto.ec2 import mock_ec2_deprecated import boto @mock_ec2_deprecated @@ -198,8 +198,8 @@ def test_something_with_ec2(): When using both boto2 and boto3, one can do this to avoid confusion: ```python -from moto import mock_ec2_deprecated as mock_ec2_b2 -from moto import mock_ec2 +from moto.ec2 import mock_ec2_deprecated as mock_ec2_b2 +from moto.ec2 import mock_ec2 ``` diff --git a/docs/_build/html/_sources/docs/getting_started.rst.txt b/docs/_build/html/_sources/docs/getting_started.rst.txt index 97f667d26448..af0cfd77bcce 100644 --- a/docs/_build/html/_sources/docs/getting_started.rst.txt +++ b/docs/_build/html/_sources/docs/getting_started.rst.txt @@ -49,7 +49,7 @@ With a decorator wrapping all the calls to S3 are automatically mocked out. .. sourcecode:: python import boto - from moto import mock_s3 + from moto.s3 import mock_s3 from mymodule import MyModel @mock_s3 diff --git a/docs/_build/html/_sources/getting_started.rst.txt b/docs/_build/html/_sources/getting_started.rst.txt index e0a4fb10e561..0130b308bfc2 100644 --- a/docs/_build/html/_sources/getting_started.rst.txt +++ b/docs/_build/html/_sources/getting_started.rst.txt @@ -47,7 +47,7 @@ With a decorator wrapping all the calls to S3 are automatically mocked out. .. sourcecode:: python import boto - from moto import mock_s3 + from moto.s3 import mock_s3 from mymodule import MyModel @mock_s3 diff --git a/docs/_build/html/_sources/getting_started.txt b/docs/_build/html/_sources/getting_started.txt index dd68a7713e6e..12e5d91162aa 100644 --- a/docs/_build/html/_sources/getting_started.txt +++ b/docs/_build/html/_sources/getting_started.txt @@ -47,7 +47,7 @@ With a decorator wrapping all the calls to S3 are automatically mocked out. .. sourcecode:: python import boto - from moto import mock_s3 + from moto.s3 import mock_s3 from mymodule import MyModel @mock_s3 diff --git a/docs/docs/getting_started.rst b/docs/docs/getting_started.rst index d52e76235e06..5900a696c640 100644 --- a/docs/docs/getting_started.rst +++ b/docs/docs/getting_started.rst @@ -49,7 +49,7 @@ With a decorator wrapping, all the calls to S3 are automatically mocked out. .. sourcecode:: python import boto - from moto import mock_s3 + from moto.s3 import mock_s3 from mymodule import MyModel @mock_s3 From 11e1d1def68dccbe796c59024cc89f4946f473c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Ehlert?= Date: Sat, 27 Jul 2019 12:52:22 +0200 Subject: [PATCH 4/9] Remove mock decorators in moto/__init__.py --- moto/__init__.py | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/moto/__init__.py b/moto/__init__.py index 8594cedd2526..799c2878300b 100644 --- a/moto/__init__.py +++ b/moto/__init__.py @@ -5,54 +5,6 @@ __title__ = 'moto' __version__ = '1.3.14.dev' -from .acm import mock_acm # flake8: noqa -from .apigateway import mock_apigateway, mock_apigateway_deprecated # flake8: noqa -from .autoscaling import mock_autoscaling, mock_autoscaling_deprecated # flake8: noqa -from .awslambda import mock_lambda, mock_lambda_deprecated # flake8: noqa -from .cloudformation import mock_cloudformation, mock_cloudformation_deprecated # flake8: noqa -from .cloudwatch import mock_cloudwatch, mock_cloudwatch_deprecated # flake8: noqa -from .cognitoidentity import mock_cognitoidentity, mock_cognitoidentity_deprecated # flake8: noqa -from .cognitoidp import mock_cognitoidp, mock_cognitoidp_deprecated # flake8: noqa -from .config import mock_config # flake8: noqa -from .datapipeline import mock_datapipeline, mock_datapipeline_deprecated # flake8: noqa -from .dynamodb import mock_dynamodb, mock_dynamodb_deprecated # flake8: noqa -from .dynamodb2 import mock_dynamodb2, mock_dynamodb2_deprecated # flake8: noqa -from .dynamodbstreams import mock_dynamodbstreams # flake8: noqa -from .ec2 import mock_ec2, mock_ec2_deprecated # flake8: noqa -from .ecr import mock_ecr, mock_ecr_deprecated # flake8: noqa -from .ecs import mock_ecs, mock_ecs_deprecated # flake8: noqa -from .elb import mock_elb, mock_elb_deprecated # flake8: noqa -from .elbv2 import mock_elbv2 # flake8: noqa -from .emr import mock_emr, mock_emr_deprecated # flake8: noqa -from .events import mock_events # flake8: noqa -from .glacier import mock_glacier, mock_glacier_deprecated # flake8: noqa -from .glue import mock_glue # flake8: noqa -from .iam import mock_iam, mock_iam_deprecated # flake8: noqa -from .kinesis import mock_kinesis, mock_kinesis_deprecated # flake8: noqa -from .kms import mock_kms, mock_kms_deprecated # flake8: noqa -from .organizations import mock_organizations # flake8: noqa -from .opsworks import mock_opsworks, mock_opsworks_deprecated # flake8: noqa -from .polly import mock_polly # flake8: noqa -from .rds import mock_rds, mock_rds_deprecated # flake8: noqa -from .rds2 import mock_rds2, mock_rds2_deprecated # flake8: noqa -from .redshift import mock_redshift, mock_redshift_deprecated # flake8: noqa -from .resourcegroups import mock_resourcegroups # flake8: noqa -from .s3 import mock_s3, mock_s3_deprecated # flake8: noqa -from .ses import mock_ses, mock_ses_deprecated # flake8: noqa -from .secretsmanager import mock_secretsmanager # flake8: noqa -from .sns import mock_sns, mock_sns_deprecated # flake8: noqa -from .sqs import mock_sqs, mock_sqs_deprecated # flake8: noqa -from .sts import mock_sts, mock_sts_deprecated # flake8: noqa -from .ssm import mock_ssm # flake8: noqa -from .route53 import mock_route53, mock_route53_deprecated # flake8: noqa -from .swf import mock_swf, mock_swf_deprecated # flake8: noqa -from .xray import mock_xray, mock_xray_client, XRaySegment # flake8: noqa -from .logs import mock_logs, mock_logs_deprecated # flake8: noqa -from .batch import mock_batch # flake8: noqa -from .resourcegroupstaggingapi import mock_resourcegroupstaggingapi # flake8: noqa -from .iot import mock_iot # flake8: noqa -from .iotdata import mock_iotdata # flake8: noqa - try: # Need to monkey-patch botocore requests back to underlying urllib3 classes From f326de577dac7251e118b69459b33110feed6921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Ehlert?= Date: Sat, 27 Jul 2019 12:52:23 +0200 Subject: [PATCH 5/9] First stab at extracting deps in setup.py to extras --- requirements.txt | 2 +- setup.py | 53 +++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4de489f8c3f7..f5a476248fa4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ # Please add requirements to setup.py --e . +-e .[all] diff --git a/setup.py b/setup.py index 17a4f6691fe9..5411f0f25ca6 100755 --- a/setup.py +++ b/setup.py @@ -32,29 +32,62 @@ def get_version(): "boto>=2.36.0", "boto3>=1.9.86", "botocore>=1.12.86", - "cryptography>=2.3.0", - "requests>=2.5", "xmltodict", "six>1.9", "werkzeug", - "PyYAML>=5.1", "pytz", "python-dateutil<3.0.0,>=2.1", - "python-jose<4.0.0", "mock", - "docker>=2.5.1", - "jsondiff==1.1.2", - "aws-xray-sdk!=0.96,>=0.93", + "requests>=2.5", "responses>=0.9.0", - "idna<2.9,>=2.5", - "cfn-lint>=0.4.0", - "sshpubkeys>=3.1.0,<4.0" ] +_dep_cryptography = "cryptography>=2.3.0" +_dep_datetime = "datetime" # ??? +_dep_PyYAML = "PyYAML>=5.1" +_dep_python_jose = "python-jose<4.0.0" +_dep_docker = "docker>=2.5.1" +_dep_jsondiff = "jsondiff==1.1.2" +_dep_aws_xray_sdk = "aws-xray-sdk!=0.96,>=0.93" +_dep_idna = "idna<2.9,>=2.5" # ??? +_dep_cfn_lint = "cfn-lint>=0.4.0" +_dep_sshpubkeys = "sshpubkeys>=3.1.0,<4.0" + +all_extra_deps = [ + _dep_cryptography, + _dep_datetime, + _dep_PyYAML, + _dep_python_jose, + _dep_docker, + _dep_jsondiff, + _dep_aws_xray_sdk, + _dep_idna, + _dep_cfn_lint, + _dep_sshpubkeys, +] + +# TODO: do we want to add ALL services here? +# i.e. even those without extra dependencies. +# Would be good for future-compatibility, I guess. +extras_per_service = { + 'ec2': [_dep_cryptography, _dep_sshpubkeys], + 'acm': [_dep_cryptography], + 'iam': [_dep_cryptography], + 'cloudformation': [_dep_PyYAML, _dep_cfn_lint], + 'cognitoidp': [_dep_python_jose], + 'awslambda': [_dep_docker], + 'batch': [_dep_docker], + 'iotdata': [_dep_jsondiff], + 'xray': [_dep_aws_xray_sdk], +} + extras_require = { + 'all': all_extra_deps, 'server': ['flask'], } +extras_require.update(extras_per_service) + # https://hynek.me/articles/conditional-python-dependencies/ if int(setuptools.__version__.split(".", 1)[0]) < 18: if sys.version_info[0:2] < (3, 3): From ecff90768eb40817002cbee16f6112be80912127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Ehlert?= Date: Sat, 27 Jul 2019 12:52:25 +0200 Subject: [PATCH 6/9] Refactor backends --- moto/backends.py | 163 +++++++++++++++++--------------------------- moto/core/models.py | 14 ++-- moto/server.py | 9 +-- 3 files changed, 76 insertions(+), 110 deletions(-) diff --git a/moto/backends.py b/moto/backends.py index 6ea85093d27b..192bc34ff785 100644 --- a/moto/backends.py +++ b/moto/backends.py @@ -1,109 +1,74 @@ from __future__ import unicode_literals +import importlib -from moto.acm import acm_backends -from moto.apigateway import apigateway_backends -from moto.autoscaling import autoscaling_backends -from moto.awslambda import lambda_backends -from moto.cloudformation import cloudformation_backends -from moto.cloudwatch import cloudwatch_backends -from moto.cognitoidentity import cognitoidentity_backends -from moto.cognitoidp import cognitoidp_backends -from moto.core import moto_api_backends -from moto.datapipeline import datapipeline_backends -from moto.dynamodb import dynamodb_backends -from moto.dynamodb2 import dynamodb_backends2 -from moto.dynamodbstreams import dynamodbstreams_backends -from moto.ec2 import ec2_backends -from moto.ecr import ecr_backends -from moto.ecs import ecs_backends -from moto.elb import elb_backends -from moto.elbv2 import elbv2_backends -from moto.emr import emr_backends -from moto.events import events_backends -from moto.glacier import glacier_backends -from moto.glue import glue_backends -from moto.iam import iam_backends -from moto.instance_metadata import instance_metadata_backends -from moto.kinesis import kinesis_backends -from moto.kms import kms_backends -from moto.logs import logs_backends -from moto.opsworks import opsworks_backends -from moto.organizations import organizations_backends -from moto.polly import polly_backends -from moto.rds2 import rds2_backends -from moto.redshift import redshift_backends -from moto.resourcegroups import resourcegroups_backends -from moto.route53 import route53_backends -from moto.s3 import s3_backends -from moto.ses import ses_backends -from moto.secretsmanager import secretsmanager_backends -from moto.sns import sns_backends -from moto.sqs import sqs_backends -from moto.ssm import ssm_backends -from moto.sts import sts_backends -from moto.swf import swf_backends -from moto.xray import xray_backends -from moto.iot import iot_backends -from moto.iotdata import iotdata_backends -from moto.batch import batch_backends -from moto.resourcegroupstaggingapi import resourcegroupstaggingapi_backends -from moto.config import config_backends -BACKENDS = { - 'acm': acm_backends, - 'apigateway': apigateway_backends, - 'autoscaling': autoscaling_backends, - 'batch': batch_backends, - 'cloudformation': cloudformation_backends, - 'cloudwatch': cloudwatch_backends, - 'cognito-identity': cognitoidentity_backends, - 'cognito-idp': cognitoidp_backends, - 'config': config_backends, - 'datapipeline': datapipeline_backends, - 'dynamodb': dynamodb_backends, - 'dynamodb2': dynamodb_backends2, - 'dynamodbstreams': dynamodbstreams_backends, - 'ec2': ec2_backends, - 'ecr': ecr_backends, - 'ecs': ecs_backends, - 'elb': elb_backends, - 'elbv2': elbv2_backends, - 'events': events_backends, - 'emr': emr_backends, - 'glacier': glacier_backends, - 'glue': glue_backends, - 'iam': iam_backends, - 'moto_api': moto_api_backends, - 'instance_metadata': instance_metadata_backends, - 'logs': logs_backends, - 'kinesis': kinesis_backends, - 'kms': kms_backends, - 'opsworks': opsworks_backends, - 'organizations': organizations_backends, - 'polly': polly_backends, - 'redshift': redshift_backends, - 'resource-groups': resourcegroups_backends, - 'rds': rds2_backends, - 's3': s3_backends, - 's3bucket_path': s3_backends, - 'ses': ses_backends, - 'secretsmanager': secretsmanager_backends, - 'sns': sns_backends, - 'sqs': sqs_backends, - 'ssm': ssm_backends, - 'sts': sts_backends, - 'swf': swf_backends, - 'route53': route53_backends, - 'lambda': lambda_backends, - 'xray': xray_backends, - 'resourcegroupstaggingapi': resourcegroupstaggingapi_backends, - 'iot': iot_backends, - 'iot-data': iotdata_backends, +_backends = { + 'acm': 'moto.acm.acm_backends', + 'apigateway': 'moto.apigateway.apigateway_backends', + 'autoscaling': 'moto.autoscaling.autoscaling_backends', + 'batch': 'moto.batch.batch_backends', + 'cloudformation': 'moto.cloudformation.cloudformation_backends', + 'cloudwatch': 'moto.cloudwatch.cloudwatch_backends', + 'cognito-identity': 'moto.cognitoidentity.cognitoidentity_backends', + 'cognito-idp': 'moto.cognitoidp.cognitoidp_backends', + 'config': 'moto.config.config_backends', + 'datapipeline': 'moto.datapipeline.datapipeline_backends', + 'dynamodb': 'moto.dynamodb.dynamodb_backends', + 'dynamodb2': 'moto.dynamodb2.dynamodb_backends2', + 'dynamodbstreams': 'moto.dynamodbstreams.dynamodbstreams_backends', + 'ec2': 'moto.ec2.ec2_backends', + 'ecr': 'moto.ecr.ecr_backends', + 'ecs': 'moto.ecs.ecs_backends', + 'elb': 'moto.elb.elb_backends', + 'elbv2': 'moto.elbv2.elbv2_backends', + 'events': 'moto.events.events_backends', + 'emr': 'moto.emr.emr_backends', + 'glacier': 'moto.glacier.glacier_backends', + 'glue': 'moto.glue.glue_backends', + 'iam': 'moto.iam.iam_backends', + 'moto_api': 'moto.core.moto_api_backends', + 'instance_metadata': 'moto.instance_metadata.instance_metadata_backends', + 'logs': 'moto.logs.logs_backends', + 'kinesis': 'moto.kinesis.kinesis_backends', + 'kms': 'moto.kms.kms_backends', + 'opsworks': 'moto.opsworks.opsworks_backends', + 'organizations': 'moto.organizations.organizations_backends', + 'polly': 'moto.polly.polly_backends', + 'redshift': 'moto.redshift.redshift_backends', + 'resource-groups': 'moto.resourcegroups.resourcegroups_backends', + 'rds': 'moto.rds2.rds2_backends', + 's3': 'moto.s3.s3_backends', + 's3bucket_path': 'moto.s3.s3_backends', + 'ses': 'moto.ses.ses_backends', + 'secretsmanager': 'moto.secretsmanager.secretsmanager_backends', + 'sns': 'moto.sns.sns_backends', + 'sqs': 'moto.sqs.sqs_backends', + 'ssm': 'moto.ssm.ssm_backends', + 'sts': 'moto.sts.sts_backends', + 'swf': 'moto.swf.swf_backends', + 'route53': 'moto.route53.route53_backends', + 'lambda': 'moto.awslambda.lambda_backends', + 'xray': 'moto.xray.xray_backends', + 'resourcegroupstaggingapi': 'moto.resourcegroupstaggingapi.resourcegroupstaggingapi_backends', + 'iot': 'moto.iot.iot_backends', + 'iot-data': 'moto.iotdata.iotdata_backends', } +def get_backend(backend_name): + import_path = _backends.get(backend_name) + if import_path is None: + raise ValueError( + "No such backend '%s'. Available backends are: %s" % (backend_name, ', '.join(_backends.keys())) + ) + module_path, member_name = import_path.rsplit('.', 1) + module = importlib.import_module(module_path) + return getattr(module, member_name) + + def get_model(name, region_name): - for backends in BACKENDS.values(): + for backend_name in _backends.keys(): + backends = get_backend(backend_name) for region, backend in backends.items(): if region == region_name: models = getattr(backend.__class__, '__models__', {}) diff --git a/moto/core/models.py b/moto/core/models.py index 896f9ac4ab33..ed4aa27cf323 100644 --- a/moto/core/models.py +++ b/moto/core/models.py @@ -15,6 +15,7 @@ import mock from moto import settings import responses +from moto.backends import get_backend from moto.packages.httpretty import HTTPretty from .utils import ( convert_httpretty_response, @@ -30,10 +31,9 @@ def __init__(self, backends): self.backends = backends self.backends_for_urls = {} - from moto.backends import BACKENDS default_backends = { - "instance_metadata": BACKENDS['instance_metadata']['global'], - "moto_api": BACKENDS['moto_api']['global'], + "instance_metadata": get_backend('instance_metadata')['global'], + "moto_api": get_backend('moto_api')['global'], } self.backends_for_urls.update(self.backends) self.backends_for_urls.update(default_backends) @@ -582,11 +582,11 @@ class deprecated_base_decorator(base_decorator): class MotoAPIBackend(BaseBackend): def reset(self): - from moto.backends import BACKENDS - for name, backends in BACKENDS.items(): - if name == "moto_api": + from moto.backends import _backends + for backend_name in _backends: + if backend_name == "moto_api": continue - for region_name, backend in backends.items(): + for _region_name, backend in get_backend(backend_name).items(): backend.reset() self.__init__() diff --git a/moto/server.py b/moto/server.py index 89be47093b8a..96da68a95606 100644 --- a/moto/server.py +++ b/moto/server.py @@ -14,7 +14,7 @@ from werkzeug.routing import BaseConverter from werkzeug.serving import run_simple -from moto.backends import BACKENDS +from moto.backends import _backends, get_backend from moto.core.utils import convert_flask_to_httpretty_response @@ -50,10 +50,11 @@ def get_backend_for_host(self, host): if self.service: return self.service - if host in BACKENDS: + if host in _backends: return host - for backend_name, backend in BACKENDS.items(): + for backend_name in _backends: + backend = get_backend(backend_name) for url_base in list(backend.values())[0].url_bases: if re.match(url_base, 'http://%s' % host): return backend_name @@ -172,7 +173,7 @@ def create_backend_app(service): backend_app.view_functions = {} backend_app.url_map = Map() backend_app.url_map.converters['regex'] = RegexConverter - backend = list(BACKENDS[service].values())[0] + backend = list(get_backend(service).values())[0] for url_path, handler in backend.flask_paths.items(): if handler.__name__ == 'dispatch': endpoint = '{0}.dispatch'.format(handler.__self__.__name__) From 47e31ca45cb25a645778b7b7c4b2adc725d20948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Ehlert?= Date: Sat, 27 Jul 2019 12:52:27 +0200 Subject: [PATCH 7/9] Resolve circular dependencies between rds/rds2 and cloudformation modules --- moto/rds/models.py | 2 +- moto/rds2/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/moto/rds/models.py b/moto/rds/models.py index feecefe0ce79..e2312313a81f 100644 --- a/moto/rds/models.py +++ b/moto/rds/models.py @@ -5,7 +5,6 @@ import boto.rds from jinja2 import Template -from moto.cloudformation.exceptions import UnformattedGetAttTemplateException from moto.core import BaseBackend, BaseModel from moto.core.utils import get_random_hex from moto.ec2.models import ec2_backends @@ -108,6 +107,7 @@ def get_cfn_attribute(self, attribute_name): return self.address elif attribute_name == 'Endpoint.Port': return self.port + from moto.cloudformation.exceptions import UnformattedGetAttTemplateException raise UnformattedGetAttTemplateException() @classmethod diff --git a/moto/rds2/models.py b/moto/rds2/models.py index 4c0daa230df0..8d1a35b0d682 100644 --- a/moto/rds2/models.py +++ b/moto/rds2/models.py @@ -8,7 +8,6 @@ import boto.rds2 from jinja2 import Template from re import compile as re_compile -from moto.cloudformation.exceptions import UnformattedGetAttTemplateException from moto.compat import OrderedDict from moto.core import BaseBackend, BaseModel from moto.core.utils import get_random_hex @@ -274,6 +273,7 @@ def get_cfn_attribute(self, attribute_name): return self.address elif attribute_name == 'Endpoint.Port': return self.port + from moto.cloudformation.exceptions import UnformattedGetAttTemplateException raise UnformattedGetAttTemplateException() @staticmethod From 0b059e1c6b875c27a90aa4d2079b677be5586ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Ehlert?= Date: Tue, 30 Jul 2019 21:59:23 +0200 Subject: [PATCH 8/9] Fix some tests that I've missed before --- tests/test_core/test_auth.py | 7 ++++++- tests/test_core/test_context_manager.py | 3 ++- tests/test_core/test_socket.py | 3 ++- tests/test_ses/test_ses_sns_boto3.py | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/test_core/test_auth.py b/tests/test_core/test_auth.py index 3a1107eaa821..20c564c5d647 100644 --- a/tests/test_core/test_auth.py +++ b/tests/test_core/test_auth.py @@ -7,7 +7,12 @@ import tests.backport_assert_raises from nose.tools import assert_raises -from moto import mock_iam, mock_ec2, mock_s3, mock_sts, mock_elbv2, mock_rds2 +from moto.iam import mock_iam +from moto.ec2 import mock_ec2 +from moto.s3 import mock_s3 +from moto.sts import mock_sts +from moto.elbv2 import mock_elbv2 +from moto.rds2 import mock_rds2 from moto.core import set_initial_no_auth_action_count from moto.iam.models import ACCOUNT_ID diff --git a/tests/test_core/test_context_manager.py b/tests/test_core/test_context_manager.py index 4824e021fffd..11a5562db781 100644 --- a/tests/test_core/test_context_manager.py +++ b/tests/test_core/test_context_manager.py @@ -1,6 +1,7 @@ import sure # noqa import boto3 -from moto import mock_sqs, settings +from moto.sqs import mock_sqs +from moto import settings def test_context_manager_returns_mock(): diff --git a/tests/test_core/test_socket.py b/tests/test_core/test_socket.py index 2e73d7b5fa47..bf060dc3e235 100644 --- a/tests/test_core/test_socket.py +++ b/tests/test_core/test_socket.py @@ -1,5 +1,6 @@ import unittest -from moto import mock_dynamodb2_deprecated, mock_dynamodb2 +from moto.dynamodb2 import mock_dynamodb2_deprecated +from moto.dynamodb2 import mock_dynamodb2 import socket from six import PY3 diff --git a/tests/test_ses/test_ses_sns_boto3.py b/tests/test_ses/test_ses_sns_boto3.py index 37f79a8b04d9..5dc0fe3db84f 100644 --- a/tests/test_ses/test_ses_sns_boto3.py +++ b/tests/test_ses/test_ses_sns_boto3.py @@ -8,7 +8,9 @@ import sure # noqa from nose import tools -from moto import mock_ses, mock_sns, mock_sqs +from moto.ses import mock_ses +from moto.sns import mock_sns +from moto.sqs import mock_sqs from moto.ses.models import SESFeedback From f710c7b7a492c411600eed9ecd50cf0a1b014d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Ehlert?= Date: Tue, 30 Jul 2019 21:59:46 +0200 Subject: [PATCH 9/9] Linting fix --- moto/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moto/__init__.py b/moto/__init__.py index 799c2878300b..c0526de51274 100644 --- a/moto/__init__.py +++ b/moto/__init__.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -import logging +# import logging # logging.getLogger('boto').setLevel(logging.CRITICAL) __title__ = 'moto'