From 59fe1abfdf6ea7285c57ee5298c24e84ffc26bc6 Mon Sep 17 00:00:00 2001 From: Steve Pulec Date: Sat, 3 Aug 2013 17:21:25 -0400 Subject: [PATCH] Cleanup flake8 --- .../test_launch_configurations.py | 2 +- tests/test_autoscaling/test_policies.py | 20 +++++++++---------- tests/test_autoscaling/test_server.py | 2 +- tests/test_core/test_decorator_calls.py | 4 ++-- tests/test_core/test_server.py | 2 +- tests/test_core/test_url_mapping.py | 2 +- tests/test_dynamodb/test_dynamodb.py | 4 +--- .../test_dynamodb_table_with_range_key.py | 6 ++---- .../test_dynamodb_table_without_range_key.py | 6 ++---- tests/test_dynamodb/test_server.py | 2 +- tests/test_ec2/test_amazon_dev_pay.py | 2 +- tests/test_ec2/test_amis.py | 2 +- .../test_availability_zones_and_regions.py | 2 +- tests/test_ec2/test_customer_gateways.py | 2 +- tests/test_ec2/test_dhcp_options.py | 2 +- tests/test_ec2/test_elastic_block_store.py | 2 +- tests/test_ec2/test_elastic_ip_addresses.py | 2 +- .../test_elastic_network_interfaces.py | 2 +- tests/test_ec2/test_general.py | 2 +- tests/test_ec2/test_instances.py | 2 +- 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_network_acls.py | 2 +- tests/test_ec2/test_placement_groups.py | 2 +- tests/test_ec2/test_reserved_instances.py | 2 +- tests/test_ec2/test_route_tables.py | 2 +- tests/test_ec2/test_security_groups.py | 2 +- tests/test_ec2/test_server.py | 2 +- tests/test_ec2/test_spot_instances.py | 2 +- tests/test_ec2/test_subnets.py | 2 +- 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_vpcs.py | 2 +- tests/test_ec2/test_vpn_connections.py | 2 +- tests/test_ec2/test_windows.py | 2 +- tests/test_elb/test_elb.py | 12 +++++------ tests/test_elb/test_server.py | 2 +- tests/test_s3/test_s3.py | 3 +-- tests/test_s3/test_server.py | 2 +- tests/test_ses/test_server.py | 2 +- tests/test_ses/test_ses.py | 19 ++++++++++++------ tests/test_sqs/test_server.py | 2 +- tests/test_sqs/test_sqs.py | 2 +- tests/test_sts/test_server.py | 2 +- tests/test_sts/test_sts.py | 3 +-- 49 files changed, 79 insertions(+), 80 deletions(-) diff --git a/tests/test_autoscaling/test_launch_configurations.py b/tests/test_autoscaling/test_launch_configurations.py index fda0a51fb..446275098 100644 --- a/tests/test_autoscaling/test_launch_configurations.py +++ b/tests/test_autoscaling/test_launch_configurations.py @@ -1,7 +1,7 @@ import boto from boto.ec2.autoscale.launchconfig import LaunchConfiguration -import sure # flake8: noqa +import sure # noqa from moto import mock_autoscaling diff --git a/tests/test_autoscaling/test_policies.py b/tests/test_autoscaling/test_policies.py index 7633a38cd..2f067151a 100644 --- a/tests/test_autoscaling/test_policies.py +++ b/tests/test_autoscaling/test_policies.py @@ -2,9 +2,9 @@ import boto from boto.ec2.autoscale.launchconfig import LaunchConfiguration from boto.ec2.autoscale.group import AutoScalingGroup from boto.ec2.autoscale.policy import ScalingPolicy -import sure # flake8: noqa +import sure # noqa -from moto import mock_autoscaling, mock_ec2 +from moto import mock_autoscaling def setup_autoscale_group(): @@ -28,7 +28,7 @@ def setup_autoscale_group(): @mock_autoscaling def test_create_policy(): - group = setup_autoscale_group() + setup_autoscale_group() conn = boto.connect_autoscale() policy = ScalingPolicy( name='ScaleUp', @@ -49,7 +49,7 @@ def test_create_policy(): @mock_autoscaling def test_create_policy_default_values(): - group = setup_autoscale_group() + setup_autoscale_group() conn = boto.connect_autoscale() policy = ScalingPolicy( name='ScaleUp', @@ -68,7 +68,7 @@ def test_create_policy_default_values(): @mock_autoscaling def test_update_policy(): - group = setup_autoscale_group() + setup_autoscale_group() conn = boto.connect_autoscale() policy = ScalingPolicy( name='ScaleUp', @@ -95,7 +95,7 @@ def test_update_policy(): @mock_autoscaling def test_delete_policy(): - group = setup_autoscale_group() + setup_autoscale_group() conn = boto.connect_autoscale() policy = ScalingPolicy( name='ScaleUp', @@ -113,7 +113,7 @@ def test_delete_policy(): @mock_autoscaling def test_execute_policy_exact_capacity(): - group = setup_autoscale_group() + setup_autoscale_group() conn = boto.connect_autoscale() policy = ScalingPolicy( name='ScaleUp', @@ -131,7 +131,7 @@ def test_execute_policy_exact_capacity(): @mock_autoscaling def test_execute_policy_positive_change_in_capacity(): - group = setup_autoscale_group() + setup_autoscale_group() conn = boto.connect_autoscale() policy = ScalingPolicy( name='ScaleUp', @@ -149,7 +149,7 @@ def test_execute_policy_positive_change_in_capacity(): @mock_autoscaling def test_execute_policy_percent_change_in_capacity(): - group = setup_autoscale_group() + setup_autoscale_group() conn = boto.connect_autoscale() policy = ScalingPolicy( name='ScaleUp', @@ -170,7 +170,7 @@ def test_execute_policy_small_percent_change_in_capacity(): """ http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/as-scale-based-on-demand.html If PercentChangeInCapacity returns a value between 0 and 1, Auto Scaling will round it off to 1.""" - group = setup_autoscale_group() + setup_autoscale_group() conn = boto.connect_autoscale() policy = ScalingPolicy( name='ScaleUp', diff --git a/tests/test_autoscaling/test_server.py b/tests/test_autoscaling/test_server.py index 61fd2107e..d3ca05cd5 100644 --- a/tests/test_autoscaling/test_server.py +++ b/tests/test_autoscaling/test_server.py @@ -1,4 +1,4 @@ -import sure # flake8: noqa +import sure # noqa import moto.server as server diff --git a/tests/test_core/test_decorator_calls.py b/tests/test_core/test_decorator_calls.py index bdf1d8a86..f9bdbe1ac 100644 --- a/tests/test_core/test_decorator_calls.py +++ b/tests/test_core/test_decorator_calls.py @@ -1,6 +1,6 @@ import boto from boto.exception import EC2ResponseError -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 @@ -11,7 +11,7 @@ Test the different ways that the decorator can be used @mock_ec2 def test_basic_connect(): - conn = boto.connect_ec2() + boto.connect_ec2() @mock_ec2 diff --git a/tests/test_core/test_server.py b/tests/test_core/test_server.py index 5ea77c853..3d29132f2 100644 --- a/tests/test_core/test_server.py +++ b/tests/test_core/test_server.py @@ -1,5 +1,5 @@ from mock import patch -import sure # flake8: noqa +import sure # noqa from moto.server import main diff --git a/tests/test_core/test_url_mapping.py b/tests/test_core/test_url_mapping.py index af688da9e..7218398e2 100644 --- a/tests/test_core/test_url_mapping.py +++ b/tests/test_core/test_url_mapping.py @@ -1,4 +1,4 @@ -import sure # flake8: noqa +import sure # noqa from moto.core.utils import convert_regex_to_flask_path diff --git a/tests/test_dynamodb/test_dynamodb.py b/tests/test_dynamodb/test_dynamodb.py index 5a2f36321..ac95fb88b 100644 --- a/tests/test_dynamodb/test_dynamodb.py +++ b/tests/test_dynamodb/test_dynamodb.py @@ -1,12 +1,10 @@ import boto -import sure # flake8: noqa -from freezegun import freeze_time +import sure # noqa import requests from moto import mock_dynamodb from moto.dynamodb import dynamodb_backend -from boto.dynamodb import condition 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 83cc81c10..0b5e56b20 100644 --- a/tests/test_dynamodb/test_dynamodb_table_with_range_key.py +++ b/tests/test_dynamodb/test_dynamodb_table_with_range_key.py @@ -1,9 +1,8 @@ import boto -import sure # flake8: noqa +import sure # noqa from freezegun import freeze_time from moto import mock_dynamodb -from moto.dynamodb import dynamodb_backend from boto.dynamodb import condition from boto.dynamodb.exceptions import DynamoDBKeyNotFoundError, DynamoDBValidationError @@ -501,5 +500,4 @@ def test_batch_read(): item.put() items = table.batch_get_item([('the-key', '123'), ('another-key', '789')]) - count = len([item for item in items]) - count.should.equal(2) + items.should.have.length_ofl(2) 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 a3d68b113..a3546bbce 100644 --- a/tests/test_dynamodb/test_dynamodb_table_without_range_key.py +++ b/tests/test_dynamodb/test_dynamodb_table_without_range_key.py @@ -1,9 +1,8 @@ import boto -import sure # flake8: noqa +import sure # noqa from freezegun import freeze_time from moto import mock_dynamodb -from moto.dynamodb import dynamodb_backend from boto.dynamodb import condition from boto.dynamodb.exceptions import DynamoDBKeyNotFoundError @@ -412,5 +411,4 @@ def test_batch_read(): item.put() items = table.batch_get_item([('the-key1'), ('another-key')]) - count = len([item for item in items]) - count.should.equal(2) + items.should.have.length_of(2) diff --git a/tests/test_dynamodb/test_server.py b/tests/test_dynamodb/test_server.py index 8b90989ae..74ca13b49 100644 --- a/tests/test_dynamodb/test_server.py +++ b/tests/test_dynamodb/test_server.py @@ -1,4 +1,4 @@ -import sure # flake8: noqa +import sure # noqa import moto.server as server diff --git a/tests/test_ec2/test_amazon_dev_pay.py b/tests/test_ec2/test_amazon_dev_pay.py index 2d7566abe..e91f1f4f3 100644 --- a/tests/test_ec2/test_amazon_dev_pay.py +++ b/tests/test_ec2/test_amazon_dev_pay.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_amis.py b/tests/test_ec2/test_amis.py index aaf63409c..6cd3812e5 100644 --- a/tests/test_ec2/test_amis.py +++ b/tests/test_ec2/test_amis.py @@ -1,7 +1,7 @@ import boto from boto.exception import EC2ResponseError -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_availability_zones_and_regions.py b/tests/test_ec2/test_availability_zones_and_regions.py index e83e090a5..3ac21bbc3 100644 --- a/tests/test_ec2/test_availability_zones_and_regions.py +++ b/tests/test_ec2/test_availability_zones_and_regions.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_customer_gateways.py b/tests/test_ec2/test_customer_gateways.py index 1b5c37a8e..ef6645e40 100644 --- a/tests/test_ec2/test_customer_gateways.py +++ b/tests/test_ec2/test_customer_gateways.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_dhcp_options.py b/tests/test_ec2/test_dhcp_options.py index 37dcc2de4..4806db2b8 100644 --- a/tests/test_ec2/test_dhcp_options.py +++ b/tests/test_ec2/test_dhcp_options.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_elastic_block_store.py b/tests/test_ec2/test_elastic_block_store.py index f6afa13c3..c8c6ef54f 100644 --- a/tests/test_ec2/test_elastic_block_store.py +++ b/tests/test_ec2/test_elastic_block_store.py @@ -1,6 +1,6 @@ import boto from boto.exception import EC2ResponseError -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_elastic_ip_addresses.py b/tests/test_ec2/test_elastic_ip_addresses.py index a7a0579c5..5aba36b92 100644 --- a/tests/test_ec2/test_elastic_ip_addresses.py +++ b/tests/test_ec2/test_elastic_ip_addresses.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_elastic_network_interfaces.py b/tests/test_ec2/test_elastic_network_interfaces.py index b0ee46b06..b158086fa 100644 --- a/tests/test_ec2/test_elastic_network_interfaces.py +++ b/tests/test_ec2/test_elastic_network_interfaces.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_general.py b/tests/test_ec2/test_general.py index f8314a848..c969eb818 100644 --- a/tests/test_ec2/test_general.py +++ b/tests/test_ec2/test_general.py @@ -1,6 +1,6 @@ import boto from boto.exception import EC2ResponseError -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_instances.py b/tests/test_ec2/test_instances.py index 5244afd4d..073ad7e4b 100644 --- a/tests/test_ec2/test_instances.py +++ b/tests/test_ec2/test_instances.py @@ -3,7 +3,7 @@ import base64 import boto from boto.ec2.instance import Reservation, InstanceAttribute from boto.exception import EC2ResponseError -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_internet_gateways.py b/tests/test_ec2/test_internet_gateways.py index ad039bed7..67f0067ea 100644 --- a/tests/test_ec2/test_internet_gateways.py +++ b/tests/test_ec2/test_internet_gateways.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_ip_addresses.py b/tests/test_ec2/test_ip_addresses.py index eecd3117b..1a6c5e84c 100644 --- a/tests/test_ec2/test_ip_addresses.py +++ b/tests/test_ec2/test_ip_addresses.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_key_pairs.py b/tests/test_ec2/test_key_pairs.py index 8d8d7b212..7a961051e 100644 --- a/tests/test_ec2/test_key_pairs.py +++ b/tests/test_ec2/test_key_pairs.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_monitoring.py b/tests/test_ec2/test_monitoring.py index b534a508f..84f513f21 100644 --- a/tests/test_ec2/test_monitoring.py +++ b/tests/test_ec2/test_monitoring.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_network_acls.py b/tests/test_ec2/test_network_acls.py index 190f6f380..92f34e54f 100644 --- a/tests/test_ec2/test_network_acls.py +++ b/tests/test_ec2/test_network_acls.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_placement_groups.py b/tests/test_ec2/test_placement_groups.py index adc913ccb..2be996840 100644 --- a/tests/test_ec2/test_placement_groups.py +++ b/tests/test_ec2/test_placement_groups.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_reserved_instances.py b/tests/test_ec2/test_reserved_instances.py index 8a99f5c23..fdb80bc63 100644 --- a/tests/test_ec2/test_reserved_instances.py +++ b/tests/test_ec2/test_reserved_instances.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_route_tables.py b/tests/test_ec2/test_route_tables.py index 57e85a4f7..3d376961f 100644 --- a/tests/test_ec2/test_route_tables.py +++ b/tests/test_ec2/test_route_tables.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_security_groups.py b/tests/test_ec2/test_security_groups.py index 4cdb9a4eb..ce8de872b 100644 --- a/tests/test_ec2/test_security_groups.py +++ b/tests/test_ec2/test_security_groups.py @@ -1,6 +1,6 @@ import boto from boto.exception import EC2ResponseError -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_server.py b/tests/test_ec2/test_server.py index 1370bd71b..2d82c1c02 100644 --- a/tests/test_ec2/test_server.py +++ b/tests/test_ec2/test_server.py @@ -1,5 +1,5 @@ import re -import sure # flake8: noqa +import sure # noqa import moto.server as server diff --git a/tests/test_ec2/test_spot_instances.py b/tests/test_ec2/test_spot_instances.py index 603e4481b..0a08e243d 100644 --- a/tests/test_ec2/test_spot_instances.py +++ b/tests/test_ec2/test_spot_instances.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_subnets.py b/tests/test_ec2/test_subnets.py index e6ebebc6b..f12d35de5 100644 --- a/tests/test_ec2/test_subnets.py +++ b/tests/test_ec2/test_subnets.py @@ -1,6 +1,6 @@ import boto from boto.exception import EC2ResponseError -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_tags.py b/tests/test_ec2/test_tags.py index 2db250f39..1138b5e9f 100644 --- a/tests/test_ec2/test_tags.py +++ b/tests/test_ec2/test_tags.py @@ -1,7 +1,7 @@ import itertools import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 @@ -31,7 +31,7 @@ def test_instance_launch_and_retrieve_all_instances(): instance.add_tag("a key", "some value") chain = itertools.chain.from_iterable - existing_instances = list(chain([reservation.instances for reservation in conn.get_all_instances()])) + existing_instances = list(chain([res.instances for res in conn.get_all_instances()])) existing_instances.should.have.length_of(1) existing_instance = existing_instances[0] existing_instance.tags["a key"].should.equal("some value") diff --git a/tests/test_ec2/test_virtual_private_gateways.py b/tests/test_ec2/test_virtual_private_gateways.py index 24e85b98d..b9fa80a65 100644 --- a/tests/test_ec2/test_virtual_private_gateways.py +++ b/tests/test_ec2/test_virtual_private_gateways.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_vm_export.py b/tests/test_ec2/test_vm_export.py index 6050a8c40..478372b78 100644 --- a/tests/test_ec2/test_vm_export.py +++ b/tests/test_ec2/test_vm_export.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_vm_import.py b/tests/test_ec2/test_vm_import.py index ef3e5e1a5..0c310fc5b 100644 --- a/tests/test_ec2/test_vm_import.py +++ b/tests/test_ec2/test_vm_import.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_vpcs.py b/tests/test_ec2/test_vpcs.py index cdf28ee55..3a4570ecd 100644 --- a/tests/test_ec2/test_vpcs.py +++ b/tests/test_ec2/test_vpcs.py @@ -1,6 +1,6 @@ import boto from boto.exception import EC2ResponseError -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_vpn_connections.py b/tests/test_ec2/test_vpn_connections.py index 589d11952..4ce1e398e 100644 --- a/tests/test_ec2/test_vpn_connections.py +++ b/tests/test_ec2/test_vpn_connections.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_ec2/test_windows.py b/tests/test_ec2/test_windows.py index 960538465..92f3be6a4 100644 --- a/tests/test_ec2/test_windows.py +++ b/tests/test_ec2/test_windows.py @@ -1,5 +1,5 @@ import boto -import sure # flake8: noqa +import sure # noqa from moto import mock_ec2 diff --git a/tests/test_elb/test_elb.py b/tests/test_elb/test_elb.py index 11ddc0ced..e21b04b65 100644 --- a/tests/test_elb/test_elb.py +++ b/tests/test_elb/test_elb.py @@ -1,6 +1,6 @@ import boto from boto.ec2.elb import HealthCheck -import sure # flake8: noqa +import sure # noqa from moto import mock_elb, mock_ec2 @@ -11,7 +11,7 @@ def test_create_load_balancer(): zones = ['us-east-1a', 'us-east-1b'] ports = [(80, 8080, 'http'), (443, 8443, 'tcp')] - lb = conn.create_load_balancer('my-lb', zones, ports) + conn.create_load_balancer('my-lb', zones, ports) balancers = conn.get_all_load_balancers() balancer = balancers[0] @@ -33,9 +33,9 @@ def test_get_load_balancers_by_name(): zones = ['us-east-1a', 'us-east-1b'] ports = [(80, 8080, 'http'), (443, 8443, 'tcp')] - lb = conn.create_load_balancer('my-lb1', zones, ports) - lb = conn.create_load_balancer('my-lb2', zones, ports) - lb = conn.create_load_balancer('my-lb3', zones, ports) + conn.create_load_balancer('my-lb1', zones, ports) + conn.create_load_balancer('my-lb2', zones, ports) + conn.create_load_balancer('my-lb3', zones, ports) conn.get_all_load_balancers().should.have.length_of(3) conn.get_all_load_balancers(load_balancer_names=['my-lb1']).should.have.length_of(1) @@ -48,7 +48,7 @@ def test_delete_load_balancer(): zones = ['us-east-1a'] ports = [(80, 8080, 'http'), (443, 8443, 'tcp')] - lb = conn.create_load_balancer('my-lb', zones, ports) + conn.create_load_balancer('my-lb', zones, ports) balancers = conn.get_all_load_balancers() balancers.should.have.length_of(1) diff --git a/tests/test_elb/test_server.py b/tests/test_elb/test_server.py index c739abb55..695e08410 100644 --- a/tests/test_elb/test_server.py +++ b/tests/test_elb/test_server.py @@ -1,4 +1,4 @@ -import sure # flake8: noqa +import sure # noqa import moto.server as server diff --git a/tests/test_s3/test_s3.py b/tests/test_s3/test_s3.py index 5215d6409..6b33f5760 100644 --- a/tests/test_s3/test_s3.py +++ b/tests/test_s3/test_s3.py @@ -1,4 +1,3 @@ -import datetime import urllib2 import boto @@ -7,7 +6,7 @@ from boto.s3.key import Key from freezegun import freeze_time import requests -import sure # flake8: noqa +import sure # noqa from moto import mock_s3 diff --git a/tests/test_s3/test_server.py b/tests/test_s3/test_server.py index 0ee507eae..d2f38cb07 100644 --- a/tests/test_s3/test_server.py +++ b/tests/test_s3/test_server.py @@ -1,4 +1,4 @@ -import sure # flake8: noqa +import sure # noqa import moto.server as server diff --git a/tests/test_ses/test_server.py b/tests/test_ses/test_server.py index 9ec047427..876fa1240 100644 --- a/tests/test_ses/test_server.py +++ b/tests/test_ses/test_server.py @@ -1,4 +1,4 @@ -import sure # flake8: noqa +import sure # noqa import moto.server as server diff --git a/tests/test_ses/test_ses.py b/tests/test_ses/test_ses.py index cde6b76b6..4c0440c40 100644 --- a/tests/test_ses/test_ses.py +++ b/tests/test_ses/test_ses.py @@ -3,7 +3,7 @@ import email import boto from boto.exception import BotoServerError -import sure # flake8: noqa +import sure # noqa from moto import mock_ses @@ -44,7 +44,8 @@ def test_delete_identity(): def test_send_email(): conn = boto.connect_ses('the_key', 'the_secret') - conn.send_email.when.called_with("test@example.com", "test subject", + conn.send_email.when.called_with( + "test@example.com", "test subject", "test body", "test_to@example.com").should.throw(BotoServerError) conn.verify_email_identity("test@example.com") @@ -74,12 +75,18 @@ def test_send_raw_email(): part.add_header('Content-Disposition', 'attachment; filename=test.txt') message.attach(part) - conn.send_raw_email.when.called_with(source=message['From'], raw_message=message.as_string(), - destinations=message['To']).should.throw(BotoServerError) + conn.send_raw_email.when.called_with( + source=message['From'], + raw_message=message.as_string(), + destinations=message['To'] + ).should.throw(BotoServerError) conn.verify_email_identity("test@example.com") - conn.send_raw_email(source=message['From'], raw_message=message.as_string(), - destinations=message['To']) + conn.send_raw_email( + source=message['From'], + raw_message=message.as_string(), + destinations=message['To'] + ) send_quota = conn.get_send_quota() sent_count = int(send_quota['GetSendQuotaResponse']['GetSendQuotaResult']['SentLast24Hours']) diff --git a/tests/test_sqs/test_server.py b/tests/test_sqs/test_server.py index 7a335b455..8934dcecc 100644 --- a/tests/test_sqs/test_server.py +++ b/tests/test_sqs/test_server.py @@ -1,5 +1,5 @@ import re -import sure # flake8: noqa +import sure # noqa import moto.server as server diff --git a/tests/test_sqs/test_sqs.py b/tests/test_sqs/test_sqs.py index e4d7de655..bfd1c2759 100644 --- a/tests/test_sqs/test_sqs.py +++ b/tests/test_sqs/test_sqs.py @@ -2,7 +2,7 @@ import boto from boto.exception import SQSError from boto.sqs.message import RawMessage import requests -import sure # flake8: noqa +import sure # noqa from moto import mock_sqs diff --git a/tests/test_sts/test_server.py b/tests/test_sts/test_server.py index 0e7687c7e..9a505422f 100644 --- a/tests/test_sts/test_server.py +++ b/tests/test_sts/test_server.py @@ -1,4 +1,4 @@ -import sure # flake8: noqa +import sure # noqa import moto.server as server diff --git a/tests/test_sts/test_sts.py b/tests/test_sts/test_sts.py index 0d05b613e..e0dbc9cd6 100644 --- a/tests/test_sts/test_sts.py +++ b/tests/test_sts/test_sts.py @@ -1,9 +1,8 @@ import json import boto -from boto.exception import BotoServerError from freezegun import freeze_time -import sure # flake8: noqa +import sure # noqa from moto import mock_sts