Test: cts-fencing: Test pcmk_delay_base/pcmk_delay_max properly

Commit f057778 fixed an off-by-one error that a test relied on to avoid
randomness in the output.

Also add a new test to ensure that pcmk_delay_base is capped by
pcmk_delay_max.

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

cts/cts-fencing.in

@@ -510,21 +510,28 @@ class FenceTests(Tests):
                      args='--output-as=xml -R true1 -a fence_dummy -o mode=pass -o "pcmk_host_list=node1 node2 node3" -o pcmk_delay_base=1')
         test.add_cmd("stonith_admin",
                      args='--output-as=xml -R false1 -a fence_dummy -o mode=fail -o "pcmk_host_list=node1 node2 node3" -o pcmk_delay_base=1')
-        # Resulting "random" delay will always be 1 since (rand() % (delay_max - delay_base)) is always 0 here
+
+        # Resulting "random" delay will be either 1 or 2 seconds
         test.add_cmd("stonith_admin",
                      args='--output-as=xml -R true2 -a fence_dummy -o mode=pass -o "pcmk_host_list=node1 node2 node3" -o pcmk_delay_base=1 -o pcmk_delay_max=2')
+
+        # Resulting delay will be 1 second (capped by pcmk_delay_max)
         test.add_cmd("stonith_admin",
-                     args='--output-as=xml -R true3 -a fence_dummy -o mode=pass -o "pcmk_host_list=node1 node2 node3"')
+                     args='--output-as=xml -R true3 -a fence_dummy -o mode=pass -o "pcmk_host_list=node1 node2 node3" -o pcmk_delay_base=2 -o pcmk_delay_max=1')
+
+        test.add_cmd("stonith_admin",
+                     args='--output-as=xml -R true4 -a fence_dummy -o mode=pass -o "pcmk_host_list=node1 node2 node3"')
 
         test.add_cmd("stonith_admin", args="--output-as=xml -r node3 -i 1 -v true1")
         test.add_cmd("stonith_admin", args="--output-as=xml -r node3 -i 1 -v false1")
         test.add_cmd("stonith_admin", args="--output-as=xml -r node3 -i 2 -v true2")
         test.add_cmd("stonith_admin", args="--output-as=xml -r node3 -i 2 -v true3")
+        test.add_cmd("stonith_admin", args="--output-as=xml -r node3 -i 2 -v true4")
 
         test.add_cmd("stonith_admin", args="--output-as=xml -F node3 --delay 1")
 
         # Total fencing timeout takes all fencing delays into account
-        test.add_log_pattern("Total timeout set to 582s")
+        test.add_log_pattern("Total timeout set to 727s")
 
         # Fencing timeout for the first device takes the requested fencing delay
         # and pcmk_delay_base into account
@@ -543,9 +550,15 @@ class FenceTests(Tests):
         # Fencing timeout takes pcmk_delay_max into account
         test.add_log_pattern(r"Requesting that .* perform 'off' action targeting node3 using true2 .*146s.*",
                              regex=True)
-        test.add_log_pattern("Delaying 'off' action targeting node3 using true2 for 1s | timeout=120s requested_delay=0s base=1s max=2s")
+        test.add_log_pattern(r"Delaying 'off' action targeting node3 using true2 for [12]s "
+                             "| timeout=120s requested_delay=0s base=1s max=2s",
+                             regex=True)
+        test.add_log_pattern(r"Requesting that .* perform 'off' action targeting node3 using true3 .*145s.*",
+                             regex=True)
+        test.add_log_pattern("Delaying 'off' action targeting node3 using true3 for 1s "
+                             "| timeout=120s requested_delay=0s base=1s max=1s")
 
-        test.add_log_pattern("Delaying 'off' action targeting node3 using true3",
+        test.add_log_pattern("Delaying 'off' action targeting node3 using true4",
                              negative=True)
 
     def build_unfence_tests(self):