From 47aa93d970928a152b451f47717424fb0f65f1b5 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Sun, 3 Apr 2022 10:54:44 +0200
Subject: [PATCH] cronvar: ensure creation of /etc/cron.d in test (#4440)
 (#4444)

* ensure creation of /etc/cron.d in test

* fixed typo

(cherry picked from commit 9e0ff8ba4b6d92dfc05fade184f059cdf4089691)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
---
 .../targets/cronvar/tasks/main.yml            | 194 +++++++++---------
 1 file changed, 98 insertions(+), 96 deletions(-)

diff --git a/tests/integration/targets/cronvar/tasks/main.yml b/tests/integration/targets/cronvar/tasks/main.yml
index 8d47eb19cf..f8090db1b6 100644
--- a/tests/integration/targets/cronvar/tasks/main.yml
+++ b/tests/integration/targets/cronvar/tasks/main.yml
@@ -3,115 +3,117 @@
 # and should not be used as examples of how to write Ansible roles #
 ####################################################################
 
-- when:
-    - not (ansible_os_family == 'Alpine' and ansible_distribution_version is version('3.15', '<'))  # TODO
-  block:
-  - name: Create EMAIL cron var
-    cronvar:
-      name: EMAIL
-      value: doug@ansibmod.con.com
-    register: create_cronvar1
+- name: Ensure /etc/cron.d directory exists
+  file:
+    path: /etc/cron.d
+    state: directory
 
-  - name: Create EMAIL cron var again
-    cronvar:
-      name: EMAIL
-      value: doug@ansibmod.con.com
-    register: create_cronvar2
+- name: Create EMAIL cron var
+  cronvar:
+    name: EMAIL
+    value: doug@ansibmod.con.com
+  register: create_cronvar1
 
-  - name: Check cron var value
-    shell: crontab -l -u root | grep -c EMAIL=doug@ansibmod.con.com
-    register: varcheck1
+- name: Create EMAIL cron var again
+  cronvar:
+    name: EMAIL
+    value: doug@ansibmod.con.com
+  register: create_cronvar2
 
-  - name: Modify EMAIL cron var
-    cronvar:
-      name: EMAIL
-      value: jane@ansibmod.con.com
-    register: create_cronvar3
+- name: Check cron var value
+  shell: crontab -l -u root | grep -c EMAIL=doug@ansibmod.con.com
+  register: varcheck1
 
-  - name: Check cron var value again
-    shell: crontab -l -u root | grep -c EMAIL=jane@ansibmod.con.com
-    register: varcheck2
+- name: Modify EMAIL cron var
+  cronvar:
+    name: EMAIL
+    value: jane@ansibmod.con.com
+  register: create_cronvar3
 
-  - name: Remove EMAIL cron var
-    cronvar:
-      name: EMAIL
-      state: absent
-    register: remove_cronvar1
+- name: Check cron var value again
+  shell: crontab -l -u root | grep -c EMAIL=jane@ansibmod.con.com
+  register: varcheck2
 
-  - name: Remove EMAIL cron var again
-    cronvar:
-      name: EMAIL
-      state: absent
-    register: remove_cronvar2
+- name: Remove EMAIL cron var
+  cronvar:
+    name: EMAIL
+    state: absent
+  register: remove_cronvar1
 
-  - name: Check cron var value again
-    shell: crontab -l -u root | grep -c EMAIL
-    register: varcheck3
-    failed_when: varcheck3.rc == 0
+- name: Remove EMAIL cron var again
+  cronvar:
+    name: EMAIL
+    state: absent
+  register: remove_cronvar2
 
-  - name: Add cron var to custom file
-    cronvar:
-      name: TESTVAR
-      value: somevalue
-      cron_file: cronvar_test
-    register: custom_cronfile1
+- name: Check cron var value again
+  shell: crontab -l -u root | grep -c EMAIL
+  register: varcheck3
+  failed_when: varcheck3.rc == 0
 
-  - name: Add cron var to custom file again
-    cronvar:
-      name: TESTVAR
-      value: somevalue
-      cron_file: cronvar_test
-    register: custom_cronfile2
+- name: Add cron var to custom file
+  cronvar:
+    name: TESTVAR
+    value: somevalue
+    cron_file: cronvar_test
+  register: custom_cronfile1
 
-  - name: Check cron var value in custom file
-    command: grep -c TESTVAR=somevalue {{ cron_config_path }}/cronvar_test
-    register: custom_varcheck1
+- name: Add cron var to custom file again
+  cronvar:
+    name: TESTVAR
+    value: somevalue
+    cron_file: cronvar_test
+  register: custom_cronfile2
 
-  - name: Change cron var in custom file
-    cronvar:
-      name: TESTVAR
-      value: newvalue
-      cron_file: cronvar_test
-    register: custom_cronfile3
+- name: Check cron var value in custom file
+  command: grep -c TESTVAR=somevalue {{ cron_config_path }}/cronvar_test
+  register: custom_varcheck1
 
-  - name: Check cron var value in custom file
-    command: grep -c TESTVAR=newvalue {{ cron_config_path }}/cronvar_test
-    register: custom_varcheck2
+- name: Change cron var in custom file
+  cronvar:
+    name: TESTVAR
+    value: newvalue
+    cron_file: cronvar_test
+  register: custom_cronfile3
 
-  - name: Remove cron var from custom file
-    cronvar:
-      name: TESTVAR
-      value: newvalue
-      cron_file: cronvar_test
-      state: absent
-    register: custom_remove_cronvar1
+- name: Check cron var value in custom file
+  command: grep -c TESTVAR=newvalue {{ cron_config_path }}/cronvar_test
+  register: custom_varcheck2
 
-  - name: Remove cron var from custom file again
-    cronvar:
-      name: TESTVAR
-      value: newvalue
-      cron_file: cronvar_test
-      state: absent
-    register: custom_remove_cronvar2
+- name: Remove cron var from custom file
+  cronvar:
+    name: TESTVAR
+    value: newvalue
+    cron_file: cronvar_test
+    state: absent
+  register: custom_remove_cronvar1
 
-  - name: Check cron var value
-    command: grep -c TESTVAR=newvalue {{ cron_config_path }}/cronvar_test
-    register: custom_varcheck3
-    failed_when: custom_varcheck3.rc == 0
+- name: Remove cron var from custom file again
+  cronvar:
+    name: TESTVAR
+    value: newvalue
+    cron_file: cronvar_test
+    state: absent
+  register: custom_remove_cronvar2
 
-  - name: Esure cronvar tasks did the right thing
-    assert:
-      that:
-        - create_cronvar1 is changed
-        - create_cronvar2 is not changed
-        - create_cronvar3 is changed
-        - remove_cronvar1 is changed
-        - remove_cronvar2 is not changed
-        - varcheck1.stdout == '1'
-        - varcheck2.stdout == '1'
-        - varcheck3.stdout == '0'
-        - custom_remove_cronvar1 is changed
-        - custom_remove_cronvar2 is not changed
-        - custom_varcheck1.stdout == '1'
-        - custom_varcheck2.stdout == '1'
-        - custom_varcheck3.stdout == '0'
+- name: Check cron var value
+  command: grep -c TESTVAR=newvalue {{ cron_config_path }}/cronvar_test
+  register: custom_varcheck3
+  failed_when: custom_varcheck3.rc == 0
+
+- name: Ensure cronvar tasks did the right thing
+  assert:
+    that:
+      - create_cronvar1 is changed
+      - create_cronvar2 is not changed
+      - create_cronvar3 is changed
+      - remove_cronvar1 is changed
+      - remove_cronvar2 is not changed
+      - varcheck1.stdout == '1'
+      - varcheck2.stdout == '1'
+      - varcheck3.stdout == '0'
+      - custom_remove_cronvar1 is changed
+      - custom_remove_cronvar2 is not changed
+      - custom_varcheck1.stdout == '1'
+      - custom_varcheck2.stdout == '1'
+      - custom_varcheck3.stdout == '0'