Skip to content

Commit

Permalink
Merge pull request ansible#7432 from elyezer/update-module-tests
Browse files Browse the repository at this point in the history
Only pass either user or org on modules test

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
  • Loading branch information
2 parents b56c753 + fb5d876 commit a74fbd6
Showing 1 changed file with 4 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
tower_credential:
name: "{{ ssh_cred_name1 }}"
organization: Default
user: admin
kind: ssh
authorize: false
authorize_password: 'test'
Expand Down Expand Up @@ -71,11 +70,10 @@
# The 20 comes from the length of OLD_INPUT_NAMES + 1 for kind
- result['deprecations'] | length() == 20

- name: Create a User-specific credential (old school)
- name: Create an Org-specific credential (old school)
tower_credential:
name: "{{ ssh_cred_name1 }}"
organization: Default
user: admin
state: present
kind: ssh
register: result
Expand All @@ -84,11 +82,10 @@
that:
- "result is changed"

- name: Re-create the User-specific credential (new school)
- name: Re-create the Org-specific credential (new school)
tower_credential:
name: "{{ ssh_cred_name1 }}"
organization: Default
user: admin
credential_type: 'Machine'
state: present
register: result
Expand All @@ -97,11 +94,10 @@
that:
- "result is not changed"

- name: Delete a User-specific credential
- name: Delete a Org-specific credential
tower_credential:
name: "{{ ssh_cred_name1 }}"
organization: Default
user: admin
state: absent
kind: ssh
register: result
Expand All @@ -110,7 +106,7 @@
that:
- "result is changed"

- name: Create the User-specific credential tied to a user, no org
- name: Create the User-specific credential
tower_credential:
name: "{{ ssh_cred_name1 }}"
user: admin
Expand Down

0 comments on commit a74fbd6

Please sign in to comment.