Skip to content

Commit b189b82

Browse files
kiera-bennettandrewhughes101
authored andcommitted
Fix jinja warnings
1 parent 83ff3f3 commit b189b82

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

tests/integration/targets/cics_data_set/playbooks/validation_template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
that:
7373
- result.failed == true
7474
- result.changed == false
75-
- result.msg == "No template or data set override found for {{ data_set_name | lower }}"
75+
- result.msg == "No template or data set override found for {}".format(data_set_name | lower)
7676
- "'executions' in result"
7777
- "'start_state' in result"
7878
- "'end_state' in result"
@@ -95,7 +95,7 @@
9595
that:
9696
- result.failed == true
9797
- result.changed == false
98-
- "'Invalid argument \"{{ region_data_set_path }}...\" for type \"data_set_base\".' in result.msg"
98+
- "'Invalid argument \"{}...\" for type \"data_set_base\".'.format(region_data_set_path) in result.msg"
9999
- "'executions' in result"
100100
- "'start_state' in result"
101101
- "'end_state' in result"

tests/integration/targets/cics_region_jcl/playbooks/region_jcl_member.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
- result.changed == false
6262
- result.start_state.exists == false
6363
- result.end_state.exists == false
64-
- result.msg == "Base data set {{ base_data_set_path }} does not exist. Can only create a member in an existing PDS/E"
64+
- result.msg == "Base data set {} does not exist. Can only create a member in an existing PDS/E".format(base_data_set_path)
6565

6666
# #############################################################################
6767

@@ -171,7 +171,7 @@
171171
- result.changed == false
172172
- result.start_state.exists == false
173173
- result.end_state.exists == false
174-
- result.msg == "Data set {{ data_set_path }} does not exist."
174+
- result.msg == "Data set {} does not exist.".format(data_set_path)
175175

176176
# #############################################################################
177177

@@ -201,7 +201,7 @@
201201
- result.changed == false
202202
- result.start_state.exists == true
203203
- result.end_state.exists == true
204-
- result.msg == "Data set {{ data_set_path }} does not contain the expected Region JCL."
204+
- result.msg == "Data set {} does not contain the expected Region JCL.".format(data_set_path)
205205

206206
# #############################################################################
207207

tests/integration/targets/cics_start_stop/playbooks/stop_args.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
that:
3939
- stop_result.failed is true
4040
- stop_result.changed is false
41-
- "{{ stop_result.executions | length }} == 0"
41+
- stop_result.executions | length == 0
4242
- stop_result.msg == "one of the following is required: job_id, job_name"
4343

4444
- name: Stop CICS using job name
@@ -84,7 +84,7 @@
8484
- stop_result.msg == ""
8585
- stop_result.executions[-1].return.failed == False
8686
- stop_result.executions[-1].return.output[0].content | length == 2
87-
- "'ON OUTPUT QUEUE' in '{{ stop_result.executions[-1].return.output[0].content | join(' ') }}'"
87+
- "'ON OUTPUT QUEUE' in stop_result.executions[-1].return.output[0].content | join(' ')"
8888
fail_msg: "CICS Region did not stop successfully"
8989
- name: Assert execution RCs are 0
9090
ansible.builtin.assert:
@@ -124,7 +124,7 @@
124124
- stop_result.msg == ""
125125
- stop_result.executions[-1].return.failed == False
126126
- stop_result.executions[-1].return.output[0].content | length == 2
127-
- "'ON OUTPUT QUEUE' in '{{ stop_result.executions[-1].return.output[0].content | join(' ') }}'"
127+
- "'ON OUTPUT QUEUE' in stop_result.executions[-1].return.output[0].content | join(' ')"
128128
fail_msg: "CICS Region did not stop successfully"
129129
- name: Assert execution RCs are 0
130130
ansible.builtin.assert:
@@ -154,8 +154,8 @@
154154
ansible.builtin.assert:
155155
that:
156156
- stop_result.failed == true
157-
- stop_result.msg == "No jobs found with name {{ start_region_applid }} and ID NONJOB"
158-
157+
- stop_result.msg == "No jobs found with name {} and ID NONJOB".format(start_region_applid)
158+
159159
- name: Issue shutdown command (wrong name)
160160
ibm.ibm_zos_cics.stop_region:
161161
job_name: "NONJOB"
@@ -172,7 +172,7 @@
172172
ansible.builtin.assert:
173173
that:
174174
- stop_result.failed == true
175-
- stop_result.msg == "No jobs found with name NONJOB and ID {{ start_result.stdout }}"
175+
- stop_result.msg == "No jobs found with name NONJOB and ID {}".format(start_result.stdout)
176176
always:
177177
- name: Delete job
178178
ansible.builtin.command:
@@ -212,7 +212,7 @@
212212
- stop_result.failed == false
213213
- stop_result.changed == false
214214
- stop_result.msg == ""
215-
215+
216216
- name: Issue shutdown command with mismatched name and id (wrong name)
217217
ibm.ibm_zos_cics.stop_region:
218218
job_id: "{{ start_result.stdout }}"
@@ -224,7 +224,7 @@
224224
that:
225225
- stop_result.failed == true
226226
- stop_result.changed == false
227-
- stop_result.msg == "No jobs found with name NONJOB and ID {{ start_result.stdout }}"
227+
- stop_result.msg == "No jobs found with name NONJOB and ID {}".format(start_result.stdout)
228228
- name: Issue shutdown command with mismatched name and id (wrong id)
229229
ibm.ibm_zos_cics.stop_region:
230230
job_id: "NONJOB"
@@ -236,7 +236,7 @@
236236
that:
237237
- stop_result.failed == true
238238
- stop_result.changed == false
239-
- stop_result.msg == "No jobs found with name {{ start_region_applid }} and ID NONJOB"
239+
- stop_result.msg == "No jobs found with name {} and ID NONJOB".format(start_region_applid)
240240

241241
always:
242242
- name: Delete job

tests/integration/targets/cics_start_stop/playbooks/validate_console_autoinstall_fail.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
ansible.builtin.assert:
4848
that:
4949
- stop_output.failed is true
50-
- stop_output.msg == "{{ AUTOINSTALL_FAIL_MSG }}"
50+
- stop_output.msg == AUTOINSTALL_FAIL_MSG
5151
- stop_output.changed is false
5252
- "'executions' in stop_output"
5353
always:

tests/integration/targets/cics_start_stop/playbooks/validate_console_not_defined.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
ansible.builtin.assert:
4848
that:
4949
- stop_output.failed is true
50-
- stop_output.msg == "{{ UNDEFINED_CONSOLE_MSG }}"
50+
- stop_output.msg == UNDEFINED_CONSOLE_MSG
5151
- stop_output.changed is false
5252
- "'executions' in stop_output"
5353
always:

tests/integration/targets/cics_start_stop/repeatable_tasks/stop_region.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
- name: Set stop_output
2525
ansible.builtin.set_fact: stop_output="{{ stop_result }}"
26-
when: "'skip_reason' not in {{ stop_result }}"
26+
when: "'skip_reason' not in stop_result"
2727

2828
- name: Issue shutdown command (with job_name)
2929
when:
@@ -75,7 +75,7 @@
7575
- stop_output.msg == ""
7676
- stop_output.executions[-1].return.failed == False
7777
- stop_output.executions[-1].return.output[0].content | length == 2
78-
- "'ON OUTPUT QUEUE' in '{{ stop_output.executions[-1].return.output[0].content | join(' ') }}'"
78+
- "'ON OUTPUT QUEUE' in stop_output.executions[-1].return.output[0].content | join(' ')"
7979
fail_msg: "CICS Region did not stop successfully"
8080

8181
- name: Assert execution RCs are 0

0 commit comments

Comments
 (0)