From 9336ec83d98a0e921dc5f97b5357e2ae3d95e3d6 Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Mon, 19 Aug 2024 12:08:12 -0700
Subject: [PATCH] activation tests fix

---
 .config/dictionary.txt                        |  1 +
 .../targets/activation/tasks/main.yml         | 26 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/.config/dictionary.txt b/.config/dictionary.txt
index ce6203b0..08171fae 100644
--- a/.config/dictionary.txt
+++ b/.config/dictionary.txt
@@ -63,3 +63,4 @@ hdrs
 testuser
 testsecret
 keygen
+testpass
diff --git a/tests/integration/targets/activation/tasks/main.yml b/tests/integration/targets/activation/tasks/main.yml
index 76ac9d7f..e6259e37 100644
--- a/tests/integration/targets/activation/tasks/main.yml
+++ b/tests/integration/targets/activation/tasks/main.yml
@@ -1,12 +1,5 @@
 ---
 - block:
-    - set_fact:
-        credential_defaults: &credential_defaults
-          controller_username: "{{ controller_username }}"
-          controller_password: "{{ controller_password }}"
-          controller_host: "{{ controller_host }}"
-          validate_certs: false
-
     - name: Generate a random_string for the test
       set_fact:
         random_string: "{{ lookup('password', '/dev/null chars=ascii_letters length=16') }}"
@@ -32,7 +25,6 @@
 
     - name: Create an AWX controller token
       ansible.eda.controller_token:
-        <<: *credential_defaults
         name: "{{ awx_token_name }}"
         description: "A test AWX controller token description"
         token: "{{ token_value }}"
@@ -40,7 +32,6 @@
 
     - name: Create a new credential type
       ansible.eda.credential_type:
-        <<: *credential_defaults
         name: "{{ credential_type_name }}"
         state: present
         description: "A test credential type"
@@ -88,7 +79,6 @@
 
     - name: Create a new SCM credential
       ansible.eda.credential:
-        <<: *credential_defaults
         name: "{{ credential_name }}"
         state: present
         credential_type_name: Source Control
@@ -107,7 +97,6 @@
 
     - name: Create a new project
       ansible.eda.project:
-        <<: *credential_defaults
         name: "{{ project_name }}"
         description: "Test Project Description"
         url: "{{ scm_url }}"
@@ -123,7 +112,6 @@
 
     - name: Create a new decision environment
       ansible.eda.decision_environment:
-        <<: *credential_defaults
         name: "{{ decision_env_name }}"
         description: "Test Decision Environment Description"
         credential: "{{ credential_name }}"
@@ -132,7 +120,6 @@
 
     - name: Create a new rulebook activation in check mode
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         description: "Example Activation description"
         project_name: "{{ project_name }}"
@@ -150,7 +137,6 @@
 
     - name: Create a new rulebook activation
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         description: "Example Activation description"
         project_name: "{{ project_name }}"
@@ -167,7 +153,6 @@
 
     - name: Create a new rulebook activation again
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         description: "Example Activation description"
         project_name: "{{ project_name }}"
@@ -185,16 +170,13 @@
 
     - name: Get information about the rulebook activation
       ansible.eda.activation_info:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
 
     - name: List all the rulebook activations
       ansible.eda.activation_info:
-        <<: *credential_defaults
 
     - name: Delete project
       ansible.eda.project:
-        <<: *credential_defaults
         name: "{{ project_name }}"
         state: absent
       register: project_deletion
@@ -207,7 +189,6 @@
 
     - name: Delete credential
       ansible.eda.credential:
-        <<: *credential_defaults
         name: "{{ credential_name }}"
         state: absent
       register: credential_deletion
@@ -220,49 +201,42 @@
 
     - name: Delete rulebook activation
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         state: absent
 
   always:
     - name: Delete AWX token
       ansible.eda.controller_token:
-        <<: *credential_defaults
         name: "{{ awx_token_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete project
       ansible.eda.project:
-        <<: *credential_defaults
         name: "{{ project_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete decision environment
       ansible.eda.decision_environment:
-        <<: *credential_defaults
         name: "{{ decision_env_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete credential
       ansible.eda.credential:
-        <<: *credential_defaults
         name: "{{ credential_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete credential type
       ansible.eda.credential_type:
-        <<: *credential_defaults
         name: "{{ credential_type_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete rulebook activation
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         state: absent
       ignore_errors: true