From aada0ae835d40f61344b976b113eeb8519eb3edc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Oct 2019 15:39:38 +0100 Subject: [PATCH] fix(saltcheck): remove trailing spaces --- cron/saltcheck-tests/config.tst | 188 +++++++++++++++---------------- cron/saltcheck-tests/service.tst | 2 +- 2 files changed, 95 insertions(+), 95 deletions(-) diff --git a/cron/saltcheck-tests/config.tst b/cron/saltcheck-tests/config.tst index bd404b4..3553d1e 100644 --- a/cron/saltcheck-tests/config.tst +++ b/cron/saltcheck-tests/config.tst @@ -2,105 +2,105 @@ # vim: ft=sls {%- from "cron/saltcheck-tests/map.jinja" import cron with context %} - -{%- if 'tasks' in cron %} - {%- for task,task_options in cron.tasks.items() %} - - {%- if task_options.type == 'present' %} -validate_cron.{{ task }}_exists: - module_and_function: cron.get_entry - args: - - {{ task_options.user|default('root') }} - - {{ task }} - assertion: assertEqual - assertion_section: identifier - expected-return: {{ task }} - - {%- if 'minute' in task_options %} -validate_cron.{{ task }}_minute: - module_and_function: cron.get_entry - args: - - {{ task_options.user|default('root') }} - - {{ task }} - assertion: assertEqual - assertion_section: minute + +{%- if 'tasks' in cron %} + {%- for task,task_options in cron.tasks.items() %} + + {%- if task_options.type == 'present' %} +validate_cron.{{ task }}_exists: + module_and_function: cron.get_entry + args: + - {{ task_options.user|default('root') }} + - {{ task }} + assertion: assertEqual + assertion_section: identifier + expected-return: {{ task }} + + {%- if 'minute' in task_options %} +validate_cron.{{ task }}_minute: + module_and_function: cron.get_entry + args: + - {{ task_options.user|default('root') }} + - {{ task }} + assertion: assertEqual + assertion_section: minute expected-return: '{{ task_options.minute }}' - {%- endif %} - - {%- if 'hour' in task_options %} -validate_cron.{{ task }}_hour: - module_and_function: cron.get_entry - args: - - {{ task_options.user|default('root') }} - - {{ task }} - assertion_section: hour - assertion: assertEqual + {%- endif %} + + {%- if 'hour' in task_options %} +validate_cron.{{ task }}_hour: + module_and_function: cron.get_entry + args: + - {{ task_options.user|default('root') }} + - {{ task }} + assertion_section: hour + assertion: assertEqual expected-return: '{{ task_options.hour }}' - {%- endif %} - - {%- if 'daymonth' in task_options %} -validate_cron.{{ task }}_daymonth: - module_and_function: cron.get_entry - args: - - {{ task_options.user|default('root') }} - - {{ task }} - assertion_section: daymonth - assertion: assertEqual + {%- endif %} + + {%- if 'daymonth' in task_options %} +validate_cron.{{ task }}_daymonth: + module_and_function: cron.get_entry + args: + - {{ task_options.user|default('root') }} + - {{ task }} + assertion_section: daymonth + assertion: assertEqual expected-return: '{{ task_options.daymonth }}' - {%- endif %} - + {%- endif %} + {%- if 'month' in task_options %} -validate_cron.{{ task }}_month: - module_and_function: cron.get_entry - args: - - {{ task_options.user|default('root') }} - - {{ task }} - assertion_section: month - assertion: assertEqual +validate_cron.{{ task }}_month: + module_and_function: cron.get_entry + args: + - {{ task_options.user|default('root') }} + - {{ task }} + assertion_section: month + assertion: assertEqual expected-return: '{{ task_options.month }}' - {%- endif %} - - {%- if 'dayweek' in task_options %} -validate_cron.{{ task }}_dayweek: - module_and_function: cron.get_entry - args: - - {{ task_options.user|default('root') }} - - {{ task }} - assertion_section: dayweek - assertion: assertEqual + {%- endif %} + + {%- if 'dayweek' in task_options %} +validate_cron.{{ task }}_dayweek: + module_and_function: cron.get_entry + args: + - {{ task_options.user|default('root') }} + - {{ task }} + assertion_section: dayweek + assertion: assertEqual expected-return: '{{ task_options.dayweek }}' - {%- endif %} - - {%- if 'comment' in task_options %} -validate_cron.{{ task }}_comment: - module_and_function: cron.get_entry - args: - - {{ task_options.user|default('root') }} - - {{ task }} - assertion_section: comment - assertion: assertEqual - expected-return: {{ task_options.comment }} - {%- endif %} - - {%- if 'commented' in task_options and task_options.commented %} -validate_cron.{{ task }}_commented: - module_and_function: cron.get_entry - args: - - {{ task_options.user|default('root') }} - - {{ task }} - assertion_section: commented - assertion: assertTrue - {%- endif %} - {%- endif %} - - {%- if task_options.type == 'absent' %} -validate_cron.{{ task }}_absent: - module_and_function: cron.get_entry - args: - - {{ task_options.user|default('root') }} - - {{ task }} - assertion: assertFalse + {%- endif %} + + {%- if 'comment' in task_options %} +validate_cron.{{ task }}_comment: + module_and_function: cron.get_entry + args: + - {{ task_options.user|default('root') }} + - {{ task }} + assertion_section: comment + assertion: assertEqual + expected-return: {{ task_options.comment }} + {%- endif %} + + {%- if 'commented' in task_options and task_options.commented %} +validate_cron.{{ task }}_commented: + module_and_function: cron.get_entry + args: + - {{ task_options.user|default('root') }} + - {{ task }} + assertion_section: commented + assertion: assertTrue + {%- endif %} + {%- endif %} + + {%- if task_options.type == 'absent' %} +validate_cron.{{ task }}_absent: + module_and_function: cron.get_entry + args: + - {{ task_options.user|default('root') }} + - {{ task }} + assertion: assertFalse {%- endif %} - - {%- endfor %} + + {%- endfor %} {%- endif %} diff --git a/cron/saltcheck-tests/service.tst b/cron/saltcheck-tests/service.tst index b831b81..1a29b20 100644 --- a/cron/saltcheck-tests/service.tst +++ b/cron/saltcheck-tests/service.tst @@ -12,4 +12,4 @@ verify_cron.service: module_and_function: service.{{ service_function }} args: - {{ cron.service }} - assertion: assertTrue + assertion: assertTrue