Merge pull request aws#1387 from kyleknap/functional-tests

Functional tests
thushan · Jun 16, 2015 · 2d67b25 · 2d67b25
2 parents 52249aa + 6840011
commit 2d67b25
Show file tree

Hide file tree

Showing 88 changed files with 38 additions and 2 deletions.
diff --git a/scripts/ci/run-tests b/scripts/ci/run-tests
@@ -17,4 +17,4 @@ def run(command):
 
 
 run('nosetests --with-coverage --cover-erase --cover-package awscli '
-    '--with-xunit --cover-xml -v unit/')
+    '--with-xunit --cover-xml -v unit/ functional/')
diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
@@ -0,0 +1,12 @@
+# Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
diff --git a/tests/unit/autoscale/__init__.py → tests/functional/autoscale/__init__.py b/tests/unit/autoscale/__init__.py → tests/functional/autoscale/__init__.py
diff --git a/...erminate_instance_in_autoscaling_group.py → ...erminate_instance_in_autoscaling_group.py b/...erminate_instance_in_autoscaling_group.py → ...erminate_instance_in_autoscaling_group.py
diff --git a/tests/functional/awslambda/__init__.py b/tests/functional/awslambda/__init__.py
@@ -0,0 +1,12 @@
+# Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
diff --git a/tests/unit/customizations/test_awslambda.py → tests/functional/awslambda/test_function.py b/tests/unit/customizations/test_awslambda.py → tests/functional/awslambda/test_function.py
diff --git a/tests/unit/cloudformation/__init__.py → tests/functional/cloudformation/__init__.py b/tests/unit/cloudformation/__init__.py → tests/functional/cloudformation/__init__.py
diff --git a/.../unit/cloudformation/test_create_stack.py → ...ional/cloudformation/test_create_stack.py b/.../unit/cloudformation/test_create_stack.py → ...ional/cloudformation/test_create_stack.py
diff --git a/tests/unit/cloudfront/__init__.py → tests/functional/cloudfront/__init__.py b/tests/unit/cloudfront/__init__.py → tests/functional/cloudfront/__init__.py
diff --git a/...loudfront/test_get_distribution_config.py → ...loudfront/test_get_distribution_config.py b/...loudfront/test_get_distribution_config.py → ...loudfront/test_get_distribution_config.py
diff --git a/tests/unit/cloudsearch/__init__.py → tests/functional/cloudsearch/__init__.py b/tests/unit/cloudsearch/__init__.py → tests/functional/cloudsearch/__init__.py
diff --git a/tests/unit/cloudsearch/test_cloudsearch.py → ...unctional/cloudsearch/test_cloudsearch.py b/tests/unit/cloudsearch/test_cloudsearch.py → ...unctional/cloudsearch/test_cloudsearch.py
diff --git a/tests/unit/cloudwatch/__init__.py → tests/functional/cloudwatch/__init__.py b/tests/unit/cloudwatch/__init__.py → tests/functional/cloudwatch/__init__.py
diff --git a/...s/unit/cloudwatch/test_put_metric_data.py → ...tional/cloudwatch/test_put_metric_data.py b/...s/unit/cloudwatch/test_put_metric_data.py → ...tional/cloudwatch/test_put_metric_data.py
diff --git a/...apipeline/test_get_pipeline_definition.py → ...apipeline/test_get_pipeline_definition.py b/...apipeline/test_get_pipeline_definition.py → ...apipeline/test_get_pipeline_definition.py
diff --git a/...s/unit/datapipeline/test_query_objects.py → ...tional/datapipeline/test_query_objects.py b/...s/unit/datapipeline/test_query_objects.py → ...tional/datapipeline/test_query_objects.py
diff --git a/tests/unit/docs/__init__.py → tests/functional/docs/__init__.py b/tests/unit/docs/__init__.py → tests/functional/docs/__init__.py
diff --git a/tests/unit/docs/test_examples.py → tests/functional/docs/test_examples.py b/tests/unit/docs/test_examples.py → tests/functional/docs/test_examples.py
diff --git a/tests/unit/docs/test_help_output.py → tests/functional/docs/test_help_output.py b/tests/unit/docs/test_help_output.py → tests/functional/docs/test_help_output.py
diff --git a/tests/unit/ec2/__init__.py → tests/functional/ec2/__init__.py b/tests/unit/ec2/__init__.py → tests/functional/ec2/__init__.py
diff --git a/tests/unit/ec2/test_associate_address.py → .../functional/ec2/test_associate_address.py b/tests/unit/ec2/test_associate_address.py → .../functional/ec2/test_associate_address.py
diff --git a/.../unit/ec2/test_attach_internet_gateway.py → ...ional/ec2/test_attach_internet_gateway.py b/.../unit/ec2/test_attach_internet_gateway.py → ...ional/ec2/test_attach_internet_gateway.py
diff --git a/tests/unit/ec2/test_bundle_instance.py → tests/functional/ec2/test_bundle_instance.py b/tests/unit/ec2/test_bundle_instance.py → tests/functional/ec2/test_bundle_instance.py
@@ -47,7 +47,7 @@ def setUp(self):
 
     def tearDown(self):
         super(TestBundleInstance, self).tearDown()
-        self.datetime_patcher.stop
+        self.datetime_patcher.stop()
 
     def test_no_policy_provided(self):
         args = ' --instance-id i-12345678 --owner-akid AKIAIOSFODNN7EXAMPLE'

diff --git a/tests/unit/ec2/test_create_image.py → tests/functional/ec2/test_create_image.py b/tests/unit/ec2/test_create_image.py → tests/functional/ec2/test_create_image.py
diff --git a/...unit/ec2/test_create_network_acl_entry.py → ...onal/ec2/test_create_network_acl_entry.py b/...unit/ec2/test_create_network_acl_entry.py → ...onal/ec2/test_create_network_acl_entry.py
diff --git a/tests/unit/ec2/test_create_tags.py → tests/functional/ec2/test_create_tags.py b/tests/unit/ec2/test_create_tags.py → tests/functional/ec2/test_create_tags.py
diff --git a/...t/ec2/test_describe_instance_attribute.py → ...l/ec2/test_describe_instance_attribute.py b/...t/ec2/test_describe_instance_attribute.py → ...l/ec2/test_describe_instance_attribute.py
diff --git a/tests/unit/ec2/test_describe_instances.py → ...functional/ec2/test_describe_instances.py b/tests/unit/ec2/test_describe_instances.py → ...functional/ec2/test_describe_instances.py
diff --git a/tests/unit/ec2/test_get_password_data.py → .../functional/ec2/test_get_password_data.py b/tests/unit/ec2/test_get_password_data.py → .../functional/ec2/test_get_password_data.py
diff --git a/...s/unit/ec2/test_modify_image_attribute.py → ...tional/ec2/test_modify_image_attribute.py b/...s/unit/ec2/test_modify_image_attribute.py → ...tional/ec2/test_modify_image_attribute.py
diff --git a/...nit/ec2/test_modify_instance_attribute.py → ...nal/ec2/test_modify_instance_attribute.py b/...nit/ec2/test_modify_instance_attribute.py → ...nal/ec2/test_modify_instance_attribute.py
diff --git a/...nit/ec2/test_replace_network_acl_entry.py → ...nal/ec2/test_replace_network_acl_entry.py b/...nit/ec2/test_replace_network_acl_entry.py → ...nal/ec2/test_replace_network_acl_entry.py
diff --git a/tests/unit/ec2/test_run_instances.py → tests/functional/ec2/test_run_instances.py b/tests/unit/ec2/test_run_instances.py → tests/functional/ec2/test_run_instances.py
diff --git a/...nit/ec2/test_security_group_operations.py → ...nal/ec2/test_security_group_operations.py b/...nit/ec2/test_security_group_operations.py → ...nal/ec2/test_security_group_operations.py
diff --git a/tests/unit/ec2/testcli.pem → tests/functional/ec2/testcli.pem b/tests/unit/ec2/testcli.pem → tests/functional/ec2/testcli.pem
diff --git a/tests/unit/elasticache/__init__.py → tests/functional/elasticache/__init__.py b/tests/unit/elasticache/__init__.py → tests/functional/elasticache/__init__.py
diff --git a/.../elasticache/test_create_cache_cluster.py → .../elasticache/test_create_cache_cluster.py b/.../elasticache/test_create_cache_cluster.py → .../elasticache/test_create_cache_cluster.py
diff --git a/tests/unit/elasticbeanstalk/__init__.py → ...s/functional/elasticbeanstalk/__init__.py b/tests/unit/elasticbeanstalk/__init__.py → ...s/functional/elasticbeanstalk/__init__.py
diff --git a/.../elasticbeanstalk/new_keypair_config.json → .../elasticbeanstalk/new_keypair_config.json b/.../elasticbeanstalk/new_keypair_config.json → .../elasticbeanstalk/new_keypair_config.json
diff --git a/...asticbeanstalk/test_create_application.py → ...asticbeanstalk/test_create_application.py b/...asticbeanstalk/test_create_application.py → ...asticbeanstalk/test_create_application.py
diff --git a/...alk/test_update_configuration_template.py → ...alk/test_update_configuration_template.py b/...alk/test_update_configuration_template.py → ...alk/test_update_configuration_template.py
diff --git a/tests/unit/elb/__init__.py → tests/functional/elb/__init__.py b/tests/unit/elb/__init__.py → tests/functional/elb/__init__.py
diff --git a/tests/unit/elb/test.json → tests/functional/elb/test.json b/tests/unit/elb/test.json → tests/functional/elb/test.json
diff --git a/...s/unit/elb/test_configure_health_check.py → ...tional/elb/test_configure_health_check.py b/...s/unit/elb/test_configure_health_check.py → ...tional/elb/test_configure_health_check.py
diff --git a/..._register_instances_with_load_balancer.py → ..._register_instances_with_load_balancer.py b/..._register_instances_with_load_balancer.py → ..._register_instances_with_load_balancer.py
diff --git a/tests/unit/elb/test_with_spaces.json → tests/functional/elb/test_with_spaces.json b/tests/unit/elb/test_with_spaces.json → tests/functional/elb/test_with_spaces.json
diff --git a/tests/unit/iam/__init__.py → tests/functional/iam/__init__.py b/tests/unit/iam/__init__.py → tests/functional/iam/__init__.py
diff --git a/...m/test_create_open_id_connect_provider.py → ...m/test_create_open_id_connect_provider.py b/...m/test_create_open_id_connect_provider.py → ...m/test_create_open_id_connect_provider.py
diff --git a/...nit/iam/test_create_virtual_mfa_device.py → ...nal/iam/test_create_virtual_mfa_device.py b/...nit/iam/test_create_virtual_mfa_device.py → ...nal/iam/test_create_virtual_mfa_device.py
diff --git a/tests/unit/machinelearning/__init__.py → tests/functional/machinelearning/__init__.py b/tests/unit/machinelearning/__init__.py → tests/functional/machinelearning/__init__.py
diff --git a/tests/unit/machinelearning/test_predict.py → ...unctional/machinelearning/test_predict.py b/tests/unit/machinelearning/test_predict.py → ...unctional/machinelearning/test_predict.py
diff --git a/tests/unit/opsworks/__init__.py → tests/functional/opsworks/__init__.py b/tests/unit/opsworks/__init__.py → tests/functional/opsworks/__init__.py
diff --git a/...nit/opsworks/create_layer_attributes.json → ...nal/opsworks/create_layer_attributes.json b/...nit/opsworks/create_layer_attributes.json → ...nal/opsworks/create_layer_attributes.json
diff --git a/tests/unit/opsworks/test_create_instance.py → ...nctional/opsworks/test_create_instance.py b/tests/unit/opsworks/test_create_instance.py → ...nctional/opsworks/test_create_instance.py
diff --git a/tests/unit/opsworks/test_create_layer.py → .../functional/opsworks/test_create_layer.py b/tests/unit/opsworks/test_create_layer.py → .../functional/opsworks/test_create_layer.py
diff --git a/tests/unit/opsworks/test_create_stack.py → .../functional/opsworks/test_create_stack.py b/tests/unit/opsworks/test_create_stack.py → .../functional/opsworks/test_create_stack.py
diff --git a/tests/unit/opsworks/test_describe_layers.py → ...nctional/opsworks/test_describe_layers.py b/tests/unit/opsworks/test_describe_layers.py → ...nctional/opsworks/test_describe_layers.py
diff --git a/tests/unit/rds/__init__.py → tests/functional/rds/__init__.py b/tests/unit/rds/__init__.py → tests/functional/rds/__init__.py
diff --git a/tests/unit/rds/test_describe_db_log_files.py → ...ctional/rds/test_describe_db_log_files.py b/tests/unit/rds/test_describe_db_log_files.py → ...ctional/rds/test_describe_db_log_files.py
diff --git a/tests/unit/rds/test_modify_option_group.py → ...unctional/rds/test_modify_option_group.py b/tests/unit/rds/test_modify_option_group.py → ...unctional/rds/test_modify_option_group.py
diff --git a/tests/unit/route53/__init__.py → tests/functional/route53/__init__.py b/tests/unit/route53/__init__.py → tests/functional/route53/__init__.py
diff --git a/...route53/test_list_resource_record_sets.py → ...route53/test_list_resource_record_sets.py b/...route53/test_list_resource_record_sets.py → ...route53/test_list_resource_record_sets.py
diff --git a/tests/unit/route53/test_resource_id.py → tests/functional/route53/test_resource_id.py b/tests/unit/route53/test_resource_id.py → tests/functional/route53/test_resource_id.py
diff --git a/tests/functional/s3/__init__.py b/tests/functional/s3/__init__.py
@@ -0,0 +1,12 @@
+# Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
diff --git a/...unit/customizations/s3/test_cp_command.py → tests/functional/s3/test_cp_command.py b/...unit/customizations/s3/test_cp_command.py → tests/functional/s3/test_cp_command.py
diff --git a/...unit/customizations/s3/test_ls_command.py → tests/functional/s3/test_ls_command.py b/...unit/customizations/s3/test_ls_command.py → tests/functional/s3/test_ls_command.py
diff --git a/...unit/customizations/s3/test_mv_command.py → tests/functional/s3/test_mv_command.py b/...unit/customizations/s3/test_mv_command.py → tests/functional/s3/test_mv_command.py
diff --git a/...it/customizations/s3/test_sync_command.py → tests/functional/s3/test_sync_command.py b/...it/customizations/s3/test_sync_command.py → tests/functional/s3/test_sync_command.py
diff --git a/...customizations/s3/test_website_command.py → tests/functional/s3/test_website_command.py b/...customizations/s3/test_website_command.py → tests/functional/s3/test_website_command.py
diff --git a/tests/unit/s3/__init__.py → tests/functional/s3api/__init__.py b/tests/unit/s3/__init__.py → tests/functional/s3api/__init__.py
diff --git a/tests/unit/s3/test_get_object.py → tests/functional/s3api/test_get_object.py b/tests/unit/s3/test_get_object.py → tests/functional/s3api/test_get_object.py
diff --git a/tests/unit/s3/test_list_objects.py → tests/functional/s3api/test_list_objects.py b/tests/unit/s3/test_list_objects.py → tests/functional/s3api/test_list_objects.py
diff --git a/tests/unit/s3/test_put_bucket_tagging.py → ...nctional/s3api/test_put_bucket_tagging.py b/tests/unit/s3/test_put_bucket_tagging.py → ...nctional/s3api/test_put_bucket_tagging.py
diff --git a/tests/unit/s3/test_put_object.py → tests/functional/s3api/test_put_object.py b/tests/unit/s3/test_put_object.py → tests/functional/s3api/test_put_object.py
diff --git a/tests/unit/s3/test_put_object_data → tests/functional/s3api/test_put_object_data b/tests/unit/s3/test_put_object_data → tests/functional/s3api/test_put_object_data
diff --git a/tests/unit/ses/__init__.py → tests/functional/ses/__init__.py b/tests/unit/ses/__init__.py → tests/functional/ses/__init__.py
diff --git a/tests/unit/ses/test_send_email.py → tests/functional/ses/test_send_email.py b/tests/unit/ses/test_send_email.py → tests/functional/ses/test_send_email.py
diff --git a/tests/unit/sns/__init__.py → tests/functional/sns/__init__.py b/tests/unit/sns/__init__.py → tests/functional/sns/__init__.py
diff --git a/...t/sns/test_create_platform_application.py → ...l/sns/test_create_platform_application.py b/...t/sns/test_create_platform_application.py → ...l/sns/test_create_platform_application.py
diff --git a/tests/unit/sqs/__init__.py → tests/functional/sqs/__init__.py b/tests/unit/sqs/__init__.py → tests/functional/sqs/__init__.py
diff --git a/tests/unit/sqs/test_add_permission.py → tests/functional/sqs/test_add_permission.py b/tests/unit/sqs/test_add_permission.py → tests/functional/sqs/test_add_permission.py
diff --git a/...nit/sqs/test_change_message_visibility.py → ...nal/sqs/test_change_message_visibility.py b/...nit/sqs/test_change_message_visibility.py → ...nal/sqs/test_change_message_visibility.py
diff --git a/tests/unit/sqs/test_create_queue.py → tests/functional/sqs/test_create_queue.py b/tests/unit/sqs/test_create_queue.py → tests/functional/sqs/test_create_queue.py
diff --git a/tests/unit/sqs/test_get_queue_attributes.py → ...nctional/sqs/test_get_queue_attributes.py b/tests/unit/sqs/test_get_queue_attributes.py → ...nctional/sqs/test_get_queue_attributes.py
diff --git a/tests/unit/sqs/test_list_queues.py → tests/functional/sqs/test_list_queues.py b/tests/unit/sqs/test_list_queues.py → tests/functional/sqs/test_list_queues.py
diff --git a/tests/unit/sqs/test_purge_queue.py → tests/functional/sqs/test_purge_queue.py b/tests/unit/sqs/test_purge_queue.py → tests/functional/sqs/test_purge_queue.py
diff --git a/tests/unit/sqs/test_set_queue_attributes.py → ...nctional/sqs/test_set_queue_attributes.py b/tests/unit/sqs/test_set_queue_attributes.py → ...nctional/sqs/test_set_queue_attributes.py
diff --git a/tests/unit/customizations/test_preview.py → tests/functional/test_preview.py b/tests/unit/customizations/test_preview.py → tests/functional/test_preview.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,4 @@ def run(command):


		run('nosetests --with-coverage --cover-erase --cover-package awscli '
		'--with-xunit --cover-xml -v unit/')
		'--with-xunit --cover-xml -v unit/ functional/')