migration test cleanup

jillr · May 3, 2021 · 6d3c30e · 6d3c30e
1 parent 5b090d9
commit 6d3c30e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/plugins/modules/ec2_instance.py b/plugins/modules/ec2_instance.py
@@ -813,11 +813,12 @@
 from ansible.module_utils._text import to_bytes, to_native
 import ansible_collections.ansible.amazon.plugins.module_utils.ec2 as ec2_utils
 from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (AWSRetry,
-                                      ansible_dict_to_boto3_filter_list,
-                                      compare_aws_tags,
-                                      boto3_tag_list_to_ansible_dict,
-                                      ansible_dict_to_boto3_tag_list,
-                                      camel_dict_to_snake_dict)
+                                                                         ansible_dict_to_boto3_filter_list,
+                                                                         compare_aws_tags,
+                                                                         boto3_tag_list_to_ansible_dict,
+                                                                         ansible_dict_to_boto3_tag_list,
+                                                                         camel_dict_to_snake_dict,
+                                                                         )
 
 from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
 

diff --git a/plugins/modules/ec2_instance_info.py b/plugins/modules/ec2_instance_info.py
@@ -504,8 +504,12 @@
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (ansible_dict_to_boto3_filter_list,
-                                      boto3_conn, boto3_tag_list_to_ansible_dict, camel_dict_to_snake_dict,
-                                      ec2_argument_spec, get_aws_connection_info)
+                                                                         boto3_conn,
+                                                                         boto3_tag_list_to_ansible_dict,
+                                                                         camel_dict_to_snake_dict,
+                                                                         ec2_argument_spec,
+                                                                         get_aws_connection_info,
+                                                                         )
 
 
 def list_ec2_instances(connection, module):

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,3 +1,5 @@
 dependencies:
   - prepare_tests
   - setup_ec2
+collections:
+  - ansible.amazon
diff --git a/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/main.yml b/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/main.yml
@@ -24,6 +24,8 @@
       aws_secret_key: "{{ aws_secret_key }}"
       security_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"
+  collections:
+    - ansible.amazon
   block:
     - debug:
         msg: "{{ inventory_hostname }} start: {{ lookup('pipe','date') }}"