Skip to content

Commit cc24572

Browse files
authored
Merge pull request #404 from sean-m-sullivan/suite_md_update
Update tests
2 parents 3f2e373 + 66f5893 commit cc24572

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repos:
1414
# types:
1515
# - yaml
1616
- repo: 'https://github.com/ansible-community/ansible-lint.git'
17-
rev: v6.8.2
17+
rev: v6.8.4
1818
hooks:
1919
# see discussions here about what arguments are used, and behavior
2020
# https://github.com/ansible/ansible-lint/issues/649
@@ -34,7 +34,7 @@ repos:
3434
hooks:
3535
- id: markdownlint-cli2
3636
- repo: https://github.com/ambv/black
37-
rev: 22.8.0
37+
rev: 22.10.0
3838
hooks:
3939
- id: black
4040
name: black

examples/configs/inventory_sources.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
controller_configuration_inventory_source_update_async_retries: 60
3+
controller_configuration_inventory_source_update_async_delay: 2
24
controller_inventory_sources:
35
- name: RHVM-01
46
source: scm

examples/configs/projects.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
controller_configuration_projects_async_retries: 60
3+
controller_configuration_projects_async_delay: 2
24
controller_projects:
35
- name: Test Project
46
scm_type: git

examples/configs_export_model/projects_export.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
controller_configuration_projects_async_retries: 60
3+
controller_configuration_projects_async_delay: 2
24
controller_projects:
35
- name: Tower Config Testing
46
description: ''

examples/configure_controller.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@
128128

129129
- name: "Error out on empty list"
130130
ansible.builtin.set_fact:
131-
error_empty_diff: "{{ lookup('controller_object_diff', api_list=controller_api_results, compare_list=differential_test_items, warn_on_empty_api=false) }}"
131+
error_empty_diff: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', api_list=controller_api_results, compare_list=differential_test_items, warn_on_empty_api=false) }}"
132132
ignore_errors: true
133133
register: error_results
134134

135135
- name: "Warn out on empty list"
136136
ansible.builtin.set_fact:
137-
warn_empty_diff: "{{ lookup('controller_object_diff', api_list=controller_api_results, compare_list=differential_test_items) }}"
137+
warn_empty_diff: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', api_list=controller_api_results, compare_list=differential_test_items) }}"
138138
register: warn_results
139139

140140
- name: "Assert that the empty list error correctly"

examples/tasks/differential.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
---
22
- name: "Get the API list in the Default Organization of all {{ differential_item.name }}"
33
ansible.builtin.set_fact:
4-
controller_api_results: "{{ lookup('awx.awx.controller_object_diff', differential_item.name, query_params={'organization': controller_organization_id.id}, host=controller_hostname, username=controller_username, password=controller_password, verify_ssl=false) }}"
4+
controller_api_results: "{{ lookup(controller_api_plugin, differential_item.name, query_params={'organization': controller_organization_id.id}, host=controller_hostname, username=controller_username, password=controller_password, verify_ssl=false) }}"
55

66
- name: "Find the difference between what is on the Controller versus curated list of {{ differential_item.name }}"
77
ansible.builtin.set_fact:
8-
set_absent_diff: "{{ lookup('awx.awx.controller_object_diff', api_list=controller_api_results, compare_list=differential_item.differential_test_items, with_present=differential_item.with_present) }}"
8+
set_absent_diff: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', api_list=controller_api_results, compare_list=differential_item.differential_test_items, with_present=differential_item.with_present) }}"
99

1010
- name: Display set_absent_diff
1111
ansible.builtin.debug:
1212
var: set_absent_diff
1313

14+
- name: Display differential_item.expected_test_result
15+
ansible.builtin.debug:
16+
var: differential_item.expected_test_result
17+
1418
- name: "Assert that the expected results match for {{ differential_item.name }}"
1519
ansible.builtin.assert:
1620
that:

0 commit comments

Comments
 (0)