File 0001-Test-cts-fencing-update-expected-total-timeouts.patch of Package pacemaker.29826
From e502c9d8127e023bbb02b46241ce8e4283c40350 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Thu, 12 May 2022 15:19:06 -0500
Subject: [PATCH] Test: cts-fencing: update expected total timeouts
should have been done with c8f12f7e
---
cts/cts-fencing.in | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
Index: pacemaker-2.0.5+20201202.ba59be712/cts/cts-fencing.in
===================================================================
--- pacemaker-2.0.5+20201202.ba59be712.orig/cts/cts-fencing.in
+++ pacemaker-2.0.5+20201202.ba59be712/cts/cts-fencing.in
@@ -637,7 +637,7 @@ class Tests(object):
'--output-as=xml -R false2 -a fence_dummy -o "mode=fail" -o "pcmk_host_list=node3" -o "pcmk_off_timeout=4"')
test.add_cmd("stonith_admin", "--output-as=xml -F node3 -t 5")
# timeout is 5+1+4 = 10
- test.add_stonith_log_pattern("Total timeout set to 10")
+ test.add_stonith_log_pattern("Total timeout set to 12")
# custom timeout _WITH_ topology
test = self.new_test("cpg_custom_timeout_2",
@@ -653,7 +653,7 @@ class Tests(object):
test.add_cmd("stonith_admin", "--output-as=xml -r node3 -i 3 -v false2")
test.add_cmd("stonith_admin", "--output-as=xml -F node3 -t 5")
# timeout is 5+1+4000 = 4006
- test.add_stonith_log_pattern("Total timeout set to 4006")
+ test.add_stonith_log_pattern("Total timeout set to 4807")
def build_fence_merge_tests(self):
""" Register tests to verify when fence operations should be merged """
@@ -765,7 +765,7 @@ class Tests(object):
"--output-as=xml -R false3 -a fence_dummy -o \"mode=fail\" -o \"pcmk_host_list=node1 node2 node3\"")
if test_type["use_cpg"] == 1:
test.add_expected_fail_cmd("stonith_admin", "--output-as=xml -F node3 -t 2", CrmExit.TIMEOUT)
- test.add_stonith_log_pattern("Total timeout set to 6")
+ test.add_stonith_log_pattern("Total timeout set to 7")
else:
test.add_expected_fail_cmd("stonith_admin", "--output-as=xml -F node3 -t 2", CrmExit.ERROR)
@@ -787,7 +787,7 @@ class Tests(object):
test.add_cmd("stonith_admin", "--output-as=xml -F node3 -t 5")
if test_type["use_cpg"] == 1:
- test.add_stonith_log_pattern("Total timeout set to 15")
+ test.add_stonith_log_pattern("Total timeout set to 18")
# test what happens when we try to use a missing fence-agent.
for test_type in test_types:
@@ -814,7 +814,7 @@ class Tests(object):
test.add_cmd("stonith_admin", "--output-as=xml -r node3 -i 1 -v true")
test.add_cmd("stonith_admin", "--output-as=xml -F node3 -t 5")
- test.add_stonith_log_pattern("Total timeout set to 5")
+ test.add_stonith_log_pattern("Total timeout set to 6")
test.add_stonith_log_pattern("for host 'node3' with device 'true' returned: 0")
@@ -832,7 +832,7 @@ class Tests(object):
test.add_cmd("stonith_admin", "--output-as=xml -d node3 -i 1")
test.add_cmd("stonith_admin", "--output-as=xml -F node3 -t 5")
- test.add_stonith_log_pattern("Total timeout set to 5")
+ test.add_stonith_log_pattern("Total timeout set to 6")
test.add_stonith_log_pattern("for host 'node3' with device 'true' returned: 0")
# test what happens when the first fencing level has multiple devices.
@@ -851,7 +851,7 @@ class Tests(object):
test.add_cmd("stonith_admin", "--output-as=xml -r node3 -i 2 -v true")
test.add_cmd("stonith_admin", "--output-as=xml -F node3 -t 20")
- test.add_stonith_log_pattern("Total timeout set to 40")
+ test.add_stonith_log_pattern("Total timeout set to 48")
test.add_stonith_log_pattern("for host 'node3' with device 'false' returned: -201")
test.add_stonith_log_pattern("for host 'node3' with device 'true' returned: 0")
@@ -885,7 +885,7 @@ class Tests(object):
test.add_cmd("stonith_admin", "--output-as=xml -F node3 -t 3")
- test.add_stonith_log_pattern("Total timeout set to 18")
+ test.add_stonith_log_pattern("Total timeout set to 21")
test.add_stonith_log_pattern("for host 'node3' with device 'false1' returned: -201")
test.add_stonith_log_pattern("for host 'node3' with device 'false2' returned: -201")
test.add_stonith_log_pattern("for host 'node3' with device 'true3' returned: 0")
@@ -952,7 +952,7 @@ class Tests(object):
test.add_cmd("stonith_admin", "--output-as=xml -F node3 -t 20")
- test.add_stonith_log_pattern("Total timeout set to 8")
+ test.add_stonith_log_pattern("Total timeout set to 96")
test.add_stonith_log_pattern("for host 'node3' with device 'false1' returned: -201")
test.add_stonith_neg_log_pattern("for host 'node3' with device 'false2' returned: ")
test.add_stonith_log_pattern("for host 'node3' with device 'true3' returned: 0")
