Fixing test issue and 'modornizing' test

awx_collection/tests/integration/targets/tower_credential_input_source/tasks/main.yml

@@ -1,10 +1,16 @@
 ---
+- name: Generate a random string for test
+  set_fact:
+    test_id: "{{ lookup('password', '/dev/null chars=ascii_letters length=16') }}"
+  when: test_id is not defined
+
 - name: Generate names
   set_fact:
-    src_cred_name: src_cred
-    target_cred_name: target_cred
+    src_cred_name: "AWX-Collection-tests-tower_credential_input_source-src_cred-{{ test_id }}"
+    target_cred_name: "AWX-Collection-tests-tower_credential_input_source-target_cred-{{ test_id }}"
 
-- name: Add Tower credential Lookup
+- block:
+    - name: Add Tower credential Lookup
       tower_credential:
         description: Credential for Testing Source
         name: "{{ src_cred_name }}"
@@ -15,11 +21,11 @@
         organization: Default
       register: src_cred_result
 
-- assert:
+    - assert:
         that:
           - "src_cred_result is changed"
 
-- name: Add Tower credential Target
+    - name: Add Tower credential Target
       tower_credential:
         description: Credential for Testing Target
         name: "{{ target_cred_name }}"
@@ -29,11 +35,11 @@
         organization: Default
       register: target_cred_result
 
-- assert:
+    - assert:
         that:
           - "target_cred_result is changed"
 
-- name: Add credential Input Source
+    - name: Add credential Input Source
       tower_credential_input_source:
         input_field_name: password
         target_credential: "{{ target_cred_result.id }}"
@@ -42,12 +48,13 @@
           object_query: "Safe=MY_SAFE;Object=AWX-user"
           object_query_format: "Exact"
         state: present
+      register: result
 
-- assert:
+    - assert:
         that:
           - "result is changed"
 
-- name: Add Second Tower credential Lookup
+    - name: Add Second Tower credential Lookup
       tower_credential:
         description: Credential for Testing Source Change
         name: "{{ src_cred_name }}-2"
@@ -58,29 +65,30 @@
         organization: Default
       register: result
 
-- name: Change credential Input Source
+    - name: Change credential Input Source
       tower_credential_input_source:
         input_field_name: password
         target_credential: "{{ target_cred_name }}"
         source_credential: "{{ src_cred_name }}-2"
         state: present
 
-- assert:
+    - assert:
         that:
           - "result is changed"
 
-- name: Remove a Tower credential source
+  always:
+    - name: Remove a Tower credential source
       tower_credential_input_source:
         input_field_name: password
         target_credential: "{{ target_cred_name }}"
         state: absent
       register: result
 
-- assert:
+    - assert:
         that:
           - "result is changed"
 
-- name: Remove Tower credential Lookup
+    - name: Remove Tower credential Lookup
       tower_credential:
         name: "{{ src_cred_name }}"
         organization: Default
@@ -88,7 +96,7 @@
         state: absent
       register: result
 
-- name: Remove Alt Tower credential Lookup
+    - name: Remove Alt Tower credential Lookup
       tower_credential:
         name: "{{ src_cred_name }}-2"
         organization: Default
@@ -96,7 +104,7 @@
         state: absent
       register: result
 
-- name: Remove Tower credential
+    - name: Remove Tower credential
       tower_credential:
         name: "{{ target_cred_name }}"
         organization: Default