Integration test dependency cleanup (#784)

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: Markus Bergholz <[email protected]>
ansible-collections · Apr 29, 2022 · c5a761d · c5a761d
1 parent 331c8ba
commit c5a761d
Show file tree

Hide file tree

Showing 39 changed files with 27 additions and 166 deletions.
diff --git a/tests/integration/targets/aws_az_info/meta/main.yml b/tests/integration/targets/aws_az_info/meta/main.yml
@@ -1,2 +1 @@
-dependencies:
-  - setup_remote_tmp_dir
+dependencies: []
diff --git a/tests/integration/targets/aws_caller_info/meta/main.yml b/tests/integration/targets/aws_caller_info/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/ec2_ami/meta/main.yml b/tests/integration/targets/ec2_ami/meta/main.yml
@@ -1,4 +1,2 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
diff --git a/tests/integration/targets/ec2_group/meta/main.yml b/tests/integration/targets/ec2_group/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/ec2_instance/meta/main.yml b/tests/integration/targets/ec2_instance/meta/main.yml
@@ -1,7 +1,6 @@
 # this just makes sure they're in the right place
 dependencies:
-- role: prepare_tests
 - role: setup_ec2_facts
 - role: setup_botocore_pip
   vars:
-    boto3_version: "1.20.30"
+    boto3_version: "1.20.30"
diff --git a/tests/integration/targets/ec2_instance/roles/ec2_instance/meta/main.yml b/tests/integration/targets/ec2_instance/roles/ec2_instance/meta/main.yml
@@ -1,5 +1,4 @@
 dependencies:
-- role: prepare_tests
 - role: setup_ec2_facts
 - role: setup_botocore_pip
   vars:

diff --git a/tests/integration/targets/ec2_key/meta/main.yml b/tests/integration/targets/ec2_key/meta/main.yml
@@ -1,7 +1,5 @@
 dependencies:
-  - prepare_tests
   - setup_sshkey
-  - setup_ec2
   - role: setup_botocore_pip
     vars:
       botocore_version: '1.21.23'
diff --git a/tests/integration/targets/ec2_metadata_facts/meta/main.yml b/tests/integration/targets/ec2_metadata_facts/meta/main.yml
@@ -1,4 +1,3 @@
 dependencies:
-- prepare_tests
 - setup_ec2_facts
 - setup_sshkey
diff --git a/tests/integration/targets/ec2_tag/meta/main.yml b/tests/integration/targets/ec2_tag/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/ec2_vpc_dhcp_option/meta/main.yml b/tests/integration/targets/ec2_vpc_dhcp_option/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/ec2_vpc_endpoint/meta/main.yml b/tests/integration/targets/ec2_vpc_endpoint/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/ec2_vpc_endpoint_service_info/meta/main.yml b/tests/integration/targets/ec2_vpc_endpoint_service_info/meta/main.yml
@@ -1,2 +1 @@
-dependencies:
-  - setup_remote_tmp_dir
+dependencies: []
diff --git a/tests/integration/targets/ec2_vpc_igw/meta/main.yml b/tests/integration/targets/ec2_vpc_igw/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/ec2_vpc_nat_gateway/meta/main.yml b/tests/integration/targets/ec2_vpc_nat_gateway/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/ec2_vpc_net/meta/main.yml b/tests/integration/targets/ec2_vpc_net/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/ec2_vpc_route_table/meta/main.yml b/tests/integration/targets/ec2_vpc_route_table/meta/main.yml
@@ -1,4 +1,2 @@
 dependencies:
-- prepare_tests
-- setup_ec2
 - setup_ec2_facts
diff --git a/tests/integration/targets/ec2_vpc_subnet/meta/main.yml b/tests/integration/targets/ec2_vpc_subnet/meta/main.yml
@@ -1,4 +1,2 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
diff --git a/tests/integration/targets/elb_classic_lb/meta/main.yml b/tests/integration/targets/elb_classic_lb/meta/main.yml
@@ -1,4 +1,2 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
   - setup_ec2_facts
diff --git a/tests/integration/targets/inventory_aws_ec2/meta/main.yml b/tests/integration/targets/inventory_aws_ec2/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/inventory_aws_rds/meta/main.yml b/tests/integration/targets/inventory_aws_rds/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/legacy_missing_tests/meta/main.yml b/tests/integration/targets/legacy_missing_tests/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/lookup_aws_account_attribute/meta/main.yml b/tests/integration/targets/lookup_aws_account_attribute/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/lookup_aws_secret/meta/main.yml b/tests/integration/targets/lookup_aws_secret/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/lookup_aws_service_ip_ranges/meta/main.yml b/tests/integration/targets/lookup_aws_service_ip_ranges/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/module_utils_core/meta/main.yml b/tests/integration/targets/module_utils_core/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/module_utils_core/roles/ansibleawsmodule.client/meta/main.yml b/tests/integration/targets/module_utils_core/roles/ansibleawsmodule.client/meta/main.yml
@@ -1,5 +1,3 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
 collections:
   - amazon.aws
diff --git a/tests/integration/targets/module_utils_waiter/meta/main.yml b/tests/integration/targets/module_utils_waiter/meta/main.yml
@@ -1,3 +1 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
diff --git a/tests/integration/targets/module_utils_waiter/roles/get_waiter/meta/main.yml b/tests/integration/targets/module_utils_waiter/roles/get_waiter/meta/main.yml
@@ -1,5 +1,3 @@
-dependencies:
-  - prepare_tests
-  - setup_ec2
+dependencies: []
 collections:
   - amazon.aws
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/s3_bucket/meta/main.yml b/tests/integration/targets/s3_bucket/meta/main.yml
@@ -1,3 +1,2 @@
 dependencies:
-  - role: prepare_tests
   - role: setup_botocore_pip
diff --git a/tests/integration/targets/s3_bucket/roles/s3_bucket/meta/main.yml b/tests/integration/targets/s3_bucket/roles/s3_bucket/meta/main.yml
@@ -1,2 +1 @@
-dependencies:
-  - role: prepare_tests
+dependencies: []
diff --git a/tests/integration/targets/setup_botocore_pip/meta/main.yml b/tests/integration/targets/setup_botocore_pip/meta/main.yml
@@ -0,0 +1 @@
+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_ec2_facts/meta/main.yml b/tests/integration/targets/setup_ec2_facts/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
diff --git a/tests/integration/targets/setup_remote_tmp_dir/meta/main.yml b/tests/integration/targets/setup_remote_tmp_dir/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []
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/setup_sshkey/meta/main.yml b/tests/integration/targets/setup_sshkey/meta/main.yml
@@ -0,0 +1 @@
+dependencies: []