ensure handlers are flushed and services are started before testing the services

Author: richm

tests/tasks/cleanup.yml

@@ -5,8 +5,3 @@
     timesync_ntp_provider: "{{ timesync_ntp_provider_os_default }}"
     timesync_ptp_domains: []
     timesync_ntp_servers: []
-
-# Do this explicitly here to ensure all services are in the correct state
-# rather than relying on the handler to be called at the end of execution.
-- name: Flush handlers
-  meta: flush_handlers

tests/tests_ntp.yml

@@ -23,9 +23,6 @@
     timesync_min_sources: 2
     timesync_ntp_hwts_interfaces: ["*"]
   tasks:
-    - name: Debug0
-      command: journalctl -ex
-
     - name: Run the role
       include_tasks: tasks/run_role_with_clear_facts.yml
       vars:
@@ -34,28 +31,27 @@
     - name: Run test
       tags: tests::verify
       block:
-        - name: Flush handlers
-          meta: flush_handlers
+        - name: Ensure services are running properly if booted
           when: __timesync_is_booted
+          block:
+            - name: Flush handlers
+              meta: flush_handlers
 
-        - name: Wait for services to start
-          wait_for:
-            timeout: 2
-          when: __timesync_is_booted
+            - name: Wait for services to start
+              wait_for:
+                timeout: 2
 
-        - name: Get list of currently used time sources
-          shell: chronyc -n sources || ntpq -pn
-          register: sources
-          changed_when: false
-          when: __timesync_is_booted
+            - name: Get list of currently used time sources
+              shell: chronyc -n sources || ntpq -pn
+              register: sources
+              changed_when: false
 
-        - name: Check time sources
-          assert:
-            that:
-              - "'172.16.123.1' in sources.stdout"
-              - "'172.16.123.2' in sources.stdout"
-              - "'172.16.123.3' in sources.stdout"
-          when: __timesync_is_booted
+            - name: Check time sources
+              assert:
+                that:
+                  - "'172.16.123.1' in sources.stdout"
+                  - "'172.16.123.2' in sources.stdout"
+                  - "'172.16.123.3' in sources.stdout"
 
         - name: Fetch chrony.conf file
           slurp:

tests/tests_ntp_provider1.yml

@@ -32,6 +32,9 @@
       tags: tests::verify
       when: __timesync_is_booted
       block:
+        - name: Flush handlers
+          meta: flush_handlers
+
         - name: Wait for services to start
           wait_for:
             timeout: 2

tests/tests_ntp_provider2.yml

@@ -46,6 +46,9 @@
       tags: tests::verify
       when: __timesync_is_booted
       block:
+        - name: Flush handlers
+          meta: flush_handlers
+
         - name: Wait for services to start
           wait_for:
             timeout: 2

tests/tests_ntp_provider3.yml

@@ -46,6 +46,9 @@
       tags: tests::verify
       when: __timesync_is_booted
       block:
+        - name: Flush handlers
+          meta: flush_handlers
+
         - name: Wait for services to start
           wait_for:
             timeout: 2

tests/tests_ntp_provider4.yml

@@ -42,6 +42,9 @@
           tags: tests::verify
           when: __timesync_is_booted
           block:
+            - name: Flush handlers
+              meta: flush_handlers
+
             - name: Wait for services to start
               wait_for:
                 timeout: 2

tests/tests_ntp_provider5.yml

@@ -42,6 +42,9 @@
           tags: tests::verify
           when: __timesync_is_booted
           block:
+            - name: Flush handlers
+              meta: flush_handlers
+
             - name: Wait for services to start
               wait_for:
                 timeout: 2

tests/tests_ntp_provider6.yml

@@ -92,7 +92,11 @@
 
     - name: Verify provider set correctly - 2
       tags: tests::verify
+      when: __timesync_is_booted
       block:
+        - name: Flush handlers
+          meta: flush_handlers
+
         - name: Wait for services to start
           wait_for:
             timeout: 2

tests/tests_ntp_ptp.yml

@@ -31,10 +31,6 @@
           vars:
             __sr_public: true
 
-        - name: Flush handlers
-          meta: flush_handlers
-          when: __timesync_is_booted
-
         - name: Ensure ethtool is installed
           package:
             name: ethtool
@@ -53,6 +49,9 @@
             - __timesync_is_booted
             - "'ware-transmit' in ethtool.stdout"
           block:
+            - name: Flush handlers
+              meta: flush_handlers
+
             - name: Wait for services to start
               wait_for:
                 timeout: 2

tests/tests_ptp_multi.yml

@@ -25,10 +25,6 @@
     - name: Run test
       tags: tests::verify
       block:
-        - name: Flush handlers
-          meta: flush_handlers
-          when: __timesync_is_booted
-
         - name: Ensure ethtool is installed
           package:
             name: ethtool
@@ -47,6 +43,9 @@
             - __timesync_is_booted
             - "'ware-transmit' in ethtool.stdout"
           block:
+            - name: Flush handlers
+              meta: flush_handlers
+
             - name: Wait for services to start
               wait_for:
                 timeout: 2