Integration test dependency cleanup (#1086)

Integration test dependency cleanup SUMMARY remove dependencies on setup_remote_tmp_dir where it's not used (often just copy & paste from another test) remove setup_ec2 (no main.yml means it's not doing anything) remove prepare_tests (empty main.yml means it's not doing anything) ISSUE TYPE Feature Pull Request COMPONENT NAME tests/integration/targets ADDITIONAL INFORMATION By cleaning up what we have we reduce the chance of people copying things about "because that's what test XYZ did". Reviewed-by: Alina Buzachis <None> Reviewed-by: Mark Woolley <[email protected]>
ansible-collections · Apr 22, 2022 · dd12046 · dd12046
1 parent 6a8a35f
commit dd12046
Show file tree

Hide file tree

Showing 46 changed files with 28 additions and 221 deletions.
diff --git a/tests/integration/targets/aws_api_gateway/meta/main.yml b/tests/integration/targets/aws_api_gateway/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/aws_eks_cluster/meta/main.yml b/tests/integration/targets/aws_eks_cluster/meta/main.yml
@@ -1,2 +1 @@
-dependencies:
-  - setup_remote_tmp_dir
+dependencies: []
diff --git a/tests/integration/targets/aws_elasticbeanstalk_app/meta/main.yml b/tests/integration/targets/aws_elasticbeanstalk_app/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/aws_kms/meta/main.yml b/tests/integration/targets/aws_kms/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/aws_msk_cluster/meta/main.yml b/tests/integration/targets/aws_msk_cluster/meta/main.yml
@@ -1,2 +1 @@
-dependencies:
-  - setup_remote_tmp_dir
+dependencies: []
diff --git a/tests/integration/targets/aws_msk_config/meta/main.yml b/tests/integration/targets/aws_msk_config/meta/main.yml
@@ -1,2 +1 @@
-dependencies:
-  - setup_remote_tmp_dir
+dependencies: []
diff --git a/tests/integration/targets/aws_region_info/meta/main.yml b/tests/integration/targets/aws_region_info/meta/main.yml
@@ -1,2 +1 @@
-dependencies:
-  - setup_remote_tmp_dir
+dependencies: []
diff --git a/tests/integration/targets/ec2_eip/meta/main.yml b/tests/integration/targets/ec2_eip/meta/main.yml
@@ -1,3 +1,2 @@
 dependencies:
-  - prepare_tests
   - setup_ec2_facts
diff --git a/tests/integration/targets/ec2_launch_template/meta/main.yml b/tests/integration/targets/ec2_launch_template/meta/main.yml
@@ -1,8 +1,5 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
-  - setup_remote_tmp_dir
   - role: setup_botocore_pip
     vars:
       boto3_version: "1.20.30"
diff --git a/tests/integration/targets/ec2_lc/meta/main.yml b/tests/integration/targets/ec2_lc/meta/main.yml
@@ -1,6 +1,4 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
   - role: setup_botocore_pip
     vars:

diff --git a/tests/integration/targets/ec2_metric_alarm/meta/main.yml b/tests/integration/targets/ec2_metric_alarm/meta/main.yml
@@ -1,4 +1,2 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
diff --git a/tests/integration/targets/ec2_scaling_policy/meta/main.yml b/tests/integration/targets/ec2_scaling_policy/meta/main.yml
@@ -1,4 +1,2 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
diff --git a/tests/integration/targets/ec2_vpc_nacl/meta/main.yml b/tests/integration/targets/ec2_vpc_nacl/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/ecs_cluster/meta/main.yml b/tests/integration/targets/ecs_cluster/meta/main.yml
@@ -1,2 +1 @@
-dependencies:
-  - setup_remote_tmp_dir
+dependencies: []
diff --git a/tests/integration/targets/ecs_ecr/meta/main.yml b/tests/integration/targets/ecs_ecr/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/elasticache_subnet_group/meta/main.yml b/tests/integration/targets/elasticache_subnet_group/meta/main.yml
@@ -1,3 +1,2 @@
 dependencies:
-  - prepare_tests
   - setup_ec2_facts
diff --git a/tests/integration/targets/elb_application_lb/meta/main.yml b/tests/integration/targets/elb_application_lb/meta/main.yml
@@ -1,2 +1 @@
-dependencies:
-  - setup_remote_tmp_dir
+dependencies: []
diff --git a/tests/integration/targets/elb_classic_lb_info/meta/main.yml b/tests/integration/targets/elb_classic_lb_info/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/elb_instance/meta/main.yml b/tests/integration/targets/elb_instance/meta/main.yml
@@ -1,4 +1,2 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
diff --git a/tests/integration/targets/elb_network_lb/meta/main.yml b/tests/integration/targets/elb_network_lb/meta/main.yml
@@ -1,4 +1,2 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
diff --git a/tests/integration/targets/elb_target/meta/main.yml b/tests/integration/targets/elb_target/meta/main.yml
@@ -1,4 +1,2 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
diff --git a/tests/integration/targets/iam_access_key/meta/main.yml b/tests/integration/targets/iam_access_key/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/iam_group/meta/main.yml b/tests/integration/targets/iam_group/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/iam_role/meta/main.yml b/tests/integration/targets/iam_role/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/iam_saml_federation/meta/main.yml b/tests/integration/targets/iam_saml_federation/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/iam_server_certificate/meta/main.yml b/tests/integration/targets/iam_server_certificate/meta/main.yml
@@ -1,3 +1,2 @@
 dependencies:
-  - prepare_tests
   - setup_remote_tmp_dir
diff --git a/tests/integration/targets/iam_user/meta/main.yml b/tests/integration/targets/iam_user/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/kinesis_stream/meta/main.yml b/tests/integration/targets/kinesis_stream/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/lambda/meta/main.yml b/tests/integration/targets/lambda/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/lambda_alias/meta/main.yml b/tests/integration/targets/lambda_alias/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/lambda_policy/meta/main.yml b/tests/integration/targets/lambda_policy/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/prepare_tests/tasks/main.yml b/tests/integration/targets/prepare_tests/tasks/main.yml
diff --git a/tests/integration/targets/rds_param_group/meta/main.yml b/tests/integration/targets/rds_param_group/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/rds_param_group/tasks/main.yml b/tests/integration/targets/rds_param_group/tasks/main.yml
@@ -11,7 +11,6 @@
 # TODO - name: test 'validate_certs' parameter
 
 # ============================================================
-# - include: ../../setup_ec2/tasks/common.yml module_name=rds_param_group
 
 - name: rds_option_group tests
   collections:

diff --git a/tests/integration/targets/rds_subnet_group/meta/main.yml b/tests/integration/targets/rds_subnet_group/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-- prepare_tests
-- setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/redshift/meta/main.yml b/tests/integration/targets/redshift/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/redshift_subnet_group/meta/main.yml b/tests/integration/targets/redshift_subnet_group/meta/main.yml
@@ -1,3 +1,2 @@
 dependencies:
-  - prepare_tests
   - setup_ec2_facts
diff --git a/tests/integration/targets/route53_health_check/meta/main.yml b/tests/integration/targets/route53_health_check/meta/main.yml
@@ -1,3 +1,2 @@
 dependencies:
-  - prepare_tests
   - setup_ec2_facts
diff --git a/tests/integration/targets/s3_bucket_notification/meta/main.yml b/tests/integration/targets/s3_bucket_notification/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/s3_sync/meta/main.yml b/tests/integration/targets/s3_sync/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/setup_ec2/defaults/main.yml b/tests/integration/targets/setup_ec2/defaults/main.yml
diff --git a/tests/integration/targets/setup_ec2/tasks/common.yml b/tests/integration/targets/setup_ec2/tasks/common.yml
diff --git a/tests/integration/targets/setup_ec2/vars/main.yml b/tests/integration/targets/setup_ec2/vars/main.yml
diff --git a/tests/integration/targets/setup_remote_tmp_dir/tasks/default.yml b/tests/integration/targets/setup_remote_tmp_dir/tasks/default.yml
@@ -1,5 +1,6 @@
 - name: create temporary directory
   tempfile:
+    path: /var/tmp
     state: directory
     suffix: .test
   register: remote_tmp_dir

diff --git a/tests/integration/targets/sts_assume_role/meta/main.yml b/tests/integration/targets/sts_assume_role/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/wafv2/meta/main.yml b/tests/integration/targets/wafv2/meta/main.yml
@@ -1,5 +1,4 @@
 dependencies:
-  - setup_remote_tmp_dir
   - role: setup_botocore_pip
     vars:
       boto3_version: "1.18.0"