From 90952a1bb7ddbba45ed8cbd62e6a8e0edb6f6148 Mon Sep 17 00:00:00 2001

From: Noriko Hosoi <nhosoi@redhat.com>

Date: Tue, 25 Aug 2020 09:05:03 -0700

Subject: [PATCH 1/7] Test playbooks enhancement

In the code to check the log message is successfully logged or not

in the /var/log/messages file, adding "until: __result is success"

and waiting up to 5 seconds.

---

 tests/tests_basics_files.yml                   | 4 ++++

 tests/tests_basics_files2.yml                  | 4 ++++

 tests/tests_basics_files_forwards.yml          | 4 ++++

 tests/tests_basics_files_log_dir.yml           | 4 ++++

 tests/tests_basics_forwards_implicit_files.yml | 4 ++++

 tests/tests_combination.yml                    | 4 ++++

 tests/tests_combination2.yml                   | 4 ++++

 tests/tests_imuxsock_files.yml                 | 4 ++++

 8 files changed, 32 insertions(+)

diff --git a/tests/tests_basics_files.yml b/tests/tests_basics_files.yml

index 080890f..87950d8 100644

--- a/tests/tests_basics_files.yml

+++ b/tests/tests_basics_files.yml

@@ -74,4 +74,8 @@

     - name: Check the test log message in {{ __default_system_log }}

       command: /bin/grep testMessage0000 {{ __default_system_log }}

+      register: __result

+      until: __result is success

+      retries: 5

+      delay: 1

       changed_when: false

diff --git a/tests/tests_basics_files2.yml b/tests/tests_basics_files2.yml

index ae61be2..094b125 100644

--- a/tests/tests_basics_files2.yml

+++ b/tests/tests_basics_files2.yml

@@ -99,4 +99,8 @@

     - name: Check the test log message in {{ __default_system_log }}

       command: /bin/grep testMessage0000 "{{ __default_system_log }}"

+      register: __result

+      until: __result is success

+      retries: 5

+      delay: 1

       changed_when: false

diff --git a/tests/tests_basics_files_forwards.yml b/tests/tests_basics_files_forwards.yml

index f43b8eb..d08a207 100644

--- a/tests/tests_basics_files_forwards.yml

+++ b/tests/tests_basics_files_forwards.yml

@@ -105,6 +105,10 @@

     - name: Check the test log message in {{ __default_system_log }}

       command: /bin/grep testMessage0000 '{{ __default_system_log }}'

+      register: __result

+      until: __result is success

+      retries: 5

+      delay: 1

       changed_when: false

     - name: Check if the forwarding config exists

diff --git a/tests/tests_basics_files_log_dir.yml b/tests/tests_basics_files_log_dir.yml

index ca900b8..f5ca266 100644

--- a/tests/tests_basics_files_log_dir.yml

+++ b/tests/tests_basics_files_log_dir.yml

@@ -78,6 +78,10 @@

     - name: Check the files output config that the path is {{ logging_system_log_dir }}/messages

       command: /bin/grep '\*.info;mail.none;authpriv.none;cron.none.*{{ logging_system_log_dir }}/messages' {{ __test_files_conf }}

+      register: __result

+      until: __result is success

+      retries: 5

+      delay: 1

       changed_when: false

     - name: Check the test log message in {{ logging_system_log_dir }}/messages

diff --git a/tests/tests_basics_forwards_implicit_files.yml b/tests/tests_basics_forwards_implicit_files.yml

index 6744d53..1d23911 100644

--- a/tests/tests_basics_forwards_implicit_files.yml

+++ b/tests/tests_basics_forwards_implicit_files.yml

@@ -92,6 +92,10 @@

     - name: Check if the test message is in {{ __default_system_log }}

       command: /bin/grep testMessage0000 '{{ __default_system_log }}'

+      register: __result

+      until: __result is success

+      retries: 5

+      delay: 1

       changed_when: false

     - name: Get the forwarding config stat

diff --git a/tests/tests_combination.yml b/tests/tests_combination.yml

index 99d57dc..8aae855 100644

--- a/tests/tests_combination.yml

+++ b/tests/tests_combination.yml

@@ -129,6 +129,10 @@

     - name: Check the test log message in {{ __default_system_log }}

       command: /bin/grep testMessage0000 '{{ __default_system_log }}'

+      register: __result

+      until: __result is success

+      retries: 5

+      delay: 1

       changed_when: false

     - name: Generated a file to check severity_and_facility

diff --git a/tests/tests_combination2.yml b/tests/tests_combination2.yml

index 5d49a57..5fe43cb 100644

--- a/tests/tests_combination2.yml

+++ b/tests/tests_combination2.yml

@@ -138,6 +138,10 @@

     - name: Check the test log message in {{ __default_system_log }}

       command: /bin/grep testMessage0000 '{{ __default_system_log }}'

+      register: __result

+      until: __result is success

+      retries: 5

+      delay: 1

       changed_when: false

     - name: Check the forwarding config stat

diff --git a/tests/tests_imuxsock_files.yml b/tests/tests_imuxsock_files.yml

index 2d6840d..35db253 100644

--- a/tests/tests_imuxsock_files.yml

+++ b/tests/tests_imuxsock_files.yml

@@ -76,4 +76,8 @@

     - name: Check the test log message in {{ __default_system_log }}

       command: /bin/grep testMessage0000 "{{ __default_system_log }}"

+      register: __result

+      until: __result is success

+      retries: 5

+      delay: 1

       changed_when: false

-- 

2.26.2