sim: show sent emails in regression tests

its good to check if any regression regarding sendmail happened, as
it can be annoying if a sendmail loop happens.

diff --git a/src/PVE/HA/Sim/TestEnv.pm b/src/PVE/HA/Sim/TestEnv.pm
index c746c903fa6f58169c9bdc0aea99d14aca4b5fb5..9220513767c29a07de0f8c21a727b1004e2f1df4 100644 (file)
--- a/src/PVE/HA/Sim/TestEnv.pm
+++ b/src/PVE/HA/Sim/TestEnv.pm
@@ -118,10 +118,4 @@ sub get_max_workers {
     return 0;
 }
 
-sub sendmail {
-    my ($self, $subject, $text) = @_;
-
-    # dismiss mails for regression tests
-}
-
 1;

diff --git a/src/test/test-basic1/log.expect b/src/test/test-basic1/log.expect
index 0d922407ceacb91069c1125021fc5b299dd9948d..93c7dfb35149122d15c99859d94b36ffb6d0dca2 100644 (file)
--- a/src/test/test-basic1/log.expect
+++ b/src/test/test-basic1/log.expect
@@ -35,6 +35,7 @@ info    124    node3/crm: status change slave => wait_for_quorum
 info    125    node3/lrm: status change active => lost_agent_lock
 info    160    node1/crm: service 'vm:103': state changed from 'started' to 'fence'
 info    160    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
+emai    160    node1/crm: FENCE: Try to fence node 'node3'
 info    166     watchdog: execute power node3 off
 info    165    node3/crm: killed by poweroff
 info    166    node3/lrm: killed by poweroff
@@ -42,6 +43,7 @@ info    166     hardware: server 'node3' stopped by poweroff (watchdog)
 info    240    node1/crm: got lock 'ha_agent_node3_lock'
 info    240    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    240    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
+emai    240    node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node3'
 info    240    node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node2'
 info    240    node1/crm: service 'vm:103': state changed from 'fence' to 'started'  (node = node2)
 info    243    node2/lrm: starting service vm:103

diff --git a/src/test/test-basic2/log.expect b/src/test/test-basic2/log.expect
index 6b112df11e2ab28ace8debfd09b8623bb85972d0..8ccce20528a95d0e0fd89acbfca0e4a1b620ec73 100644 (file)
--- a/src/test/test-basic2/log.expect
+++ b/src/test/test-basic2/log.expect
@@ -11,6 +11,7 @@ info     22    node3/crm: node 'node2': state changed from 'online' => 'unknown'
 info     22    node3/crm: got lock 'ha_agent_node1_lock'
 info     22    node3/crm: fencing: acknowledged - got agent lock for node 'node1'
 info     22    node3/crm: node 'node1': state changed from 'fence' => 'unknown'
+emai     22    node3/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node1'
 info     22    node3/crm: recover service 'vm:101' from fenced node 'node1' to node 'node3'
 info     22    node3/crm: service 'vm:101': state changed from 'fence' to 'started'  (node = node3)
 info     23    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-basic5/log.expect b/src/test/test-basic5/log.expect
index a0db483094ed2afedd542b8a65e444b3748671f7..8274f44797286b66d094c0e199007b9cfb335bc7 100644 (file)
--- a/src/test/test-basic5/log.expect
+++ b/src/test/test-basic5/log.expect
@@ -43,9 +43,11 @@ info    222    node3/crm: status change slave => master
 info    222    node3/crm: node 'node1': state changed from 'online' => 'unknown'
 info    282    node3/crm: service 'vm:101': state changed from 'started' to 'fence'
 info    282    node3/crm: node 'node1': state changed from 'unknown' => 'fence'
+emai    282    node3/crm: FENCE: Try to fence node 'node1'
 info    282    node3/crm: got lock 'ha_agent_node1_lock'
 info    282    node3/crm: fencing: acknowledged - got agent lock for node 'node1'
 info    282    node3/crm: node 'node1': state changed from 'fence' => 'unknown'
+emai    282    node3/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node1'
 info    282    node3/crm: recover service 'vm:101' from fenced node 'node1' to node 'node2'
 info    282    node3/crm: service 'vm:101': state changed from 'fence' to 'started'  (node = node2)
 info    301    node2/lrm: starting service vm:101

diff --git a/src/test/test-locked-service1/log.expect b/src/test/test-locked-service1/log.expect
index f3f84f3a47c9d2323c8453847532e307857702eb..ebd3805436f118ee574d07ec3415b3910d69dd4a 100644 (file)
--- a/src/test/test-locked-service1/log.expect
+++ b/src/test/test-locked-service1/log.expect
@@ -27,6 +27,7 @@ info    224    node3/crm: status change slave => wait_for_quorum
 info    225    node3/lrm: status change active => lost_agent_lock
 info    260    node1/crm: service 'vm:103': state changed from 'started' to 'fence'
 info    260    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
+emai    260    node1/crm: FENCE: Try to fence node 'node3'
 info    266     watchdog: execute power node3 off
 info    265    node3/crm: killed by poweroff
 info    266    node3/lrm: killed by poweroff
@@ -34,6 +35,7 @@ info    266     hardware: server 'node3' stopped by poweroff (watchdog)
 info    340    node1/crm: got lock 'ha_agent_node3_lock'
 info    340    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    340    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
+emai    340    node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node3'
 info    340    node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node1'
 warn    340    node1/crm: removed leftover lock 'backup' from recovered service 'vm:103' to allow its start.
 info    340    node1/crm: service 'vm:103': state changed from 'fence' to 'started'  (node = node1)

diff --git a/src/test/test-recovery1/log.expect b/src/test/test-recovery1/log.expect
index 7a9232a29143f32da4a2b09c6aafa9a130d17b50..62b7c90233397e2279163bbad413db27f7b59128 100644 (file)
--- a/src/test/test-recovery1/log.expect
+++ b/src/test/test-recovery1/log.expect
@@ -26,6 +26,7 @@ info    122    node2/crm: status change slave => wait_for_quorum
 info    123    node2/lrm: status change active => lost_agent_lock
 info    160    node1/crm: service 'vm:102': state changed from 'started' to 'fence'
 info    160    node1/crm: node 'node2': state changed from 'unknown' => 'fence'
+emai    160    node1/crm: FENCE: Try to fence node 'node2'
 info    164     watchdog: execute power node2 off
 info    163    node2/crm: killed by poweroff
 info    164    node2/lrm: killed by poweroff
@@ -33,6 +34,7 @@ info    164     hardware: server 'node2' stopped by poweroff (watchdog)
 info    240    node1/crm: got lock 'ha_agent_node2_lock'
 info    240    node1/crm: fencing: acknowledged - got agent lock for node 'node2'
 info    240    node1/crm: node 'node2': state changed from 'fence' => 'unknown'
+emai    240    node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node2'
 err     240    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 info    240    node1/crm: service 'vm:102': state changed from 'fence' to 'error'
 info    720     hardware: exit simulation - done

diff --git a/src/test/test-service-ignore2/log.expect b/src/test/test-service-ignore2/log.expect
index 27e52f8508279451474aa208d0b494634c206dd5..e089d719ae1358425c69beefcb533af221d62c70 100644 (file)
--- a/src/test/test-service-ignore2/log.expect
+++ b/src/test/test-service-ignore2/log.expect
@@ -34,9 +34,11 @@ info    320      cmdlist: execute service vm:103 started
 info    320    node1/crm: adding new service 'vm:103' on node 'node3'
 info    320    node1/crm: service 'vm:103': state changed from 'started' to 'fence'
 info    320    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
+emai    320    node1/crm: FENCE: Try to fence node 'node3'
 info    340    node1/crm: got lock 'ha_agent_node3_lock'
 info    340    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    340    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
+emai    340    node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node3'
 info    340    node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node1'
 info    340    node1/crm: service 'vm:103': state changed from 'fence' to 'started'  (node = node1)
 info    341    node1/lrm: got lock 'ha_agent_node1_lock'

diff --git a/src/test/test-service-stopped2/log.expect b/src/test/test-service-stopped2/log.expect
index f8166ca8622e975837df485344bcbb8b517bb0f1..585621dc8d5431c954ea21c8ec78f754d9a3b361 100644 (file)
--- a/src/test/test-service-stopped2/log.expect
+++ b/src/test/test-service-stopped2/log.expect
@@ -26,6 +26,7 @@ info    224    node3/crm: status change slave => wait_for_quorum
 info    225    node3/lrm: status change active => lost_agent_lock
 info    260    node1/crm: service 'fa:1501': state changed from 'stopped' to 'fence'
 info    260    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
+emai    260    node1/crm: FENCE: Try to fence node 'node3'
 info    266     watchdog: execute power node3 off
 info    265    node3/crm: killed by poweroff
 info    266    node3/lrm: killed by poweroff
@@ -33,6 +34,7 @@ info    266     hardware: server 'node3' stopped by poweroff (watchdog)
 info    340    node1/crm: got lock 'ha_agent_node3_lock'
 info    340    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    340    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
+emai    340    node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node3'
 info    340    node1/crm: recover service 'fa:1501' from fenced node 'node3' to node 'node1'
 info    340    node1/crm: service 'fa:1501': state changed from 'fence' to 'request_stop'  (node = node1)
 info    341    node1/lrm: got lock 'ha_agent_node1_lock'

diff --git a/src/test/test-shutdown1/log.expect b/src/test/test-shutdown1/log.expect
index 9d7203a504d222868360c4962d41dabbb2df1f21..e46f13f8e6e8cb1dbcc417b03292891fb539f000 100644 (file)
--- a/src/test/test-shutdown1/log.expect
+++ b/src/test/test-shutdown1/log.expect
@@ -33,9 +33,11 @@ info    145     shutdown: execute power node3 off
 info    160    node1/crm: node 'node3': state changed from 'online' => 'unknown'
 info    200    node1/crm: service 'vm:103': state changed from 'started' to 'fence'
 info    200    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
+emai    200    node1/crm: FENCE: Try to fence node 'node3'
 info    200    node1/crm: got lock 'ha_agent_node3_lock'
 info    200    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    200    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
+emai    200    node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node3'
 info    200    node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node1'
 info    200    node1/crm: service 'vm:103': state changed from 'fence' to 'started'  (node = node1)
 info    201    node1/lrm: got lock 'ha_agent_node1_lock'

diff --git a/src/test/test-shutdown2/log.expect b/src/test/test-shutdown2/log.expect
index 423b36fa3583ca7b7cf6884781fdf4601200b9c7..bf4c319bbca309025355640a44b3481a047ad3ad 100644 (file)
--- a/src/test/test-shutdown2/log.expect
+++ b/src/test/test-shutdown2/log.expect
@@ -33,9 +33,11 @@ info    145     shutdown: execute power node3 off
 info    160    node1/crm: node 'node3': state changed from 'online' => 'unknown'
 info    200    node1/crm: service 'vm:103': state changed from 'started' to 'fence'
 info    200    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
+emai    200    node1/crm: FENCE: Try to fence node 'node3'
 info    200    node1/crm: got lock 'ha_agent_node3_lock'
 info    200    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    200    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
+emai    200    node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node3'
 info    200    node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node1'
 info    200    node1/crm: service 'vm:103': state changed from 'fence' to 'started'  (node = node1)
 info    201    node1/lrm: got lock 'ha_agent_node1_lock'

diff --git a/src/test/test-shutdown3/log.expect b/src/test/test-shutdown3/log.expect
index 94ecfe18218bb6b52ccfb39f386d580a3a8636a6..571cb89022e055f4d209a66504d9c3df308ddb52 100644 (file)
--- a/src/test/test-shutdown3/log.expect
+++ b/src/test/test-shutdown3/log.expect
@@ -33,9 +33,11 @@ info    145     shutdown: execute power node3 off
 info    160    node1/crm: node 'node3': state changed from 'online' => 'unknown'
 info    200    node1/crm: service 'ct:103': state changed from 'started' to 'fence'
 info    200    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
+emai    200    node1/crm: FENCE: Try to fence node 'node3'
 info    200    node1/crm: got lock 'ha_agent_node3_lock'
 info    200    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    200    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
+emai    200    node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node3'
 info    200    node1/crm: recover service 'ct:103' from fenced node 'node3' to node 'node1'
 info    200    node1/crm: service 'ct:103': state changed from 'fence' to 'started'  (node = node1)
 info    201    node1/lrm: got lock 'ha_agent_node1_lock'

diff --git a/src/test/test-shutdown4/log.expect b/src/test/test-shutdown4/log.expect
index 7496def686bd54f88bfba094f0f8b076ec7d799f..afebeff7761c582a18f3c66f8fcf7f1664bd6fbd 100644 (file)
--- a/src/test/test-shutdown4/log.expect
+++ b/src/test/test-shutdown4/log.expect
@@ -36,9 +36,11 @@ info    141    node2/crm: status change slave => master
 info    141    node2/crm: node 'node1': state changed from 'online' => 'unknown'
 info    220    node2/crm: service 'vm:100': state changed from 'started' to 'fence'
 info    220    node2/crm: node 'node1': state changed from 'unknown' => 'fence'
+emai    220    node2/crm: FENCE: Try to fence node 'node1'
 info    220    node2/crm: got lock 'ha_agent_node1_lock'
 info    220    node2/crm: fencing: acknowledged - got agent lock for node 'node1'
 info    220    node2/crm: node 'node1': state changed from 'fence' => 'unknown'
+emai    220    node2/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node1'
 info    220    node2/crm: recover service 'vm:100' from fenced node 'node1' to node 'node2'
 info    220    node2/crm: service 'vm:100': state changed from 'fence' to 'started'  (node = node2)
 info    221    node2/lrm: got lock 'ha_agent_node2_lock'