From ef683f4767d75aae7a9483b1c325b13fc39f2821 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Fri, 6 Apr 2018 12:53:26 -0500 Subject: [PATCH] Test: pengine: update regression tests for notification changes --- pengine/test10/a-demote-then-b-migrate.exp | 32 +- pengine/test10/a-promote-then-b-migrate.exp | 16 +- pengine/test10/bug-1572-2.exp | 28 +- pengine/test10/bug-1685.exp | 16 +- pengine/test10/bug-5143-ms-shuffle.exp | 16 +- pengine/test10/bug-cl-5168.exp | 16 +- pengine/test10/bug-cl-5212.exp | 12 +- pengine/test10/bug-cl-5247.exp | 12 +- pengine/test10/bug-lf-2153.exp | 12 +- pengine/test10/bug-lf-2317.exp | 16 +- pengine/test10/bundle-order-fencing.dot | 34 -- pengine/test10/bundle-order-fencing.exp | 527 +++++++-------------- pengine/test10/bundle-order-fencing.summary | 10 - pengine/test10/bundle-order-partial-start-2.exp | 8 +- pengine/test10/bundle-order-partial-start.exp | 8 +- pengine/test10/bundle-order-partial-stop.dot | 3 - pengine/test10/bundle-order-partial-stop.exp | 14 +- pengine/test10/bundle-order-startup-clone.dot | 3 - pengine/test10/bundle-order-stop-clone.exp | 20 +- pengine/test10/bundle-order-stop-on-remote.exp | 44 +- pengine/test10/bundle-order-stop.dot | 3 - pengine/test10/bundle-order-stop.exp | 14 +- pengine/test10/colo_master_w_native.exp | 32 +- pengine/test10/colo_slave_w_native.exp | 32 +- pengine/test10/group-dependents.exp | 32 +- pengine/test10/inc10.exp | 28 +- pengine/test10/interleave-pseudo-stop.exp | 12 +- pengine/test10/interleave-stop.exp | 36 +- pengine/test10/master-13.exp | 32 +- pengine/test10/master-demote.exp | 16 +- pengine/test10/master-dependent-ban.exp | 16 +- pengine/test10/master-failed-demote.exp | 36 +- pengine/test10/master-move.exp | 32 +- pengine/test10/master-notify.exp | 24 +- pengine/test10/master-partially-demoted-group.exp | 32 +- pengine/test10/novell-239082.exp | 36 +- pengine/test10/novell-252693.exp | 36 +- .../test10/one-or-more-unrunnable-instances.exp | 12 +- pengine/test10/order_constraint_stops_master.dot | 1 - pengine/test10/order_constraint_stops_master.exp | 10 +- pengine/test10/order_constraint_stops_slave.dot | 1 - pengine/test10/order_constraint_stops_slave.exp | 4 +- pengine/test10/probe-0.exp | 8 +- pengine/test10/probe-2.exp | 48 +- pengine/test10/remote-recover-all.exp | 8 +- pengine/test10/remote-recover-connection.exp | 8 +- pengine/test10/remote-recover-no-resources.exp | 8 +- pengine/test10/remote-recover-unknown.exp | 8 +- pengine/test10/remote-recovery.exp | 8 +- 49 files changed, 719 insertions(+), 922 deletions(-) diff --git a/pengine/test10/a-demote-then-b-migrate.exp b/pengine/test10/a-demote-then-b-migrate.exp index 2b12db2..e31e125 100644 --- a/pengine/test10/a-demote-then-b-migrate.exp +++ b/pengine/test10/a-demote-then-b-migrate.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -202,10 +202,10 @@ - + - + @@ -235,10 +235,10 @@ - + - + @@ -288,10 +288,10 @@ - + - + @@ -321,10 +321,10 @@ - + - + diff --git a/pengine/test10/a-promote-then-b-migrate.exp b/pengine/test10/a-promote-then-b-migrate.exp index 26cd1b1..f5ef735 100644 --- a/pengine/test10/a-promote-then-b-migrate.exp +++ b/pengine/test10/a-promote-then-b-migrate.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -103,10 +103,10 @@ - + - + @@ -136,10 +136,10 @@ - + - + diff --git a/pengine/test10/bug-1572-2.exp b/pengine/test10/bug-1572-2.exp index a854f62..58885e2 100644 --- a/pengine/test10/bug-1572-2.exp +++ b/pengine/test10/bug-1572-2.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -127,10 +127,10 @@ - + - + @@ -160,10 +160,10 @@ - + - + @@ -216,7 +216,7 @@ - + @@ -246,10 +246,10 @@ - + - + diff --git a/pengine/test10/bug-1685.exp b/pengine/test10/bug-1685.exp index 8b46500..7d6f29b 100644 --- a/pengine/test10/bug-1685.exp +++ b/pengine/test10/bug-1685.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -88,10 +88,10 @@ - + - + @@ -121,10 +121,10 @@ - + - + diff --git a/pengine/test10/bug-5143-ms-shuffle.exp b/pengine/test10/bug-5143-ms-shuffle.exp index e8fb58c..caa1474 100644 --- a/pengine/test10/bug-5143-ms-shuffle.exp +++ b/pengine/test10/bug-5143-ms-shuffle.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -104,10 +104,10 @@ - + - + @@ -137,10 +137,10 @@ - + - + diff --git a/pengine/test10/bug-cl-5168.exp b/pengine/test10/bug-cl-5168.exp index f4b3b79..729c7a6 100644 --- a/pengine/test10/bug-cl-5168.exp +++ b/pengine/test10/bug-cl-5168.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -104,10 +104,10 @@ - + - + @@ -137,10 +137,10 @@ - + - + diff --git a/pengine/test10/bug-cl-5212.exp b/pengine/test10/bug-cl-5212.exp index 344711b..4ee6d88 100644 --- a/pengine/test10/bug-cl-5212.exp +++ b/pengine/test10/bug-cl-5212.exp @@ -41,9 +41,9 @@ - + - + @@ -54,9 +54,9 @@ - + - + @@ -76,7 +76,7 @@ - + @@ -106,7 +106,7 @@ - + diff --git a/pengine/test10/bug-cl-5247.exp b/pengine/test10/bug-cl-5247.exp index 7f55c64..c21ed7d 100644 --- a/pengine/test10/bug-cl-5247.exp +++ b/pengine/test10/bug-cl-5247.exp @@ -451,7 +451,7 @@ - + @@ -464,7 +464,7 @@ - + @@ -477,7 +477,7 @@ - + @@ -534,7 +534,7 @@ - + @@ -564,7 +564,7 @@ - + @@ -644,7 +644,7 @@ - + diff --git a/pengine/test10/bug-lf-2153.exp b/pengine/test10/bug-lf-2153.exp index abe1554..6b8713c 100644 --- a/pengine/test10/bug-lf-2153.exp +++ b/pengine/test10/bug-lf-2153.exp @@ -1,7 +1,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -92,10 +92,10 @@ - + - + diff --git a/pengine/test10/bug-lf-2317.exp b/pengine/test10/bug-lf-2317.exp index cf84cd5..a50bce3 100644 --- a/pengine/test10/bug-lf-2317.exp +++ b/pengine/test10/bug-lf-2317.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -103,10 +103,10 @@ - + - + @@ -136,10 +136,10 @@ - + - + diff --git a/pengine/test10/bundle-order-fencing.dot b/pengine/test10/bundle-order-fencing.dot index 980bab4..e53a062 100644 --- a/pengine/test10/bundle-order-fencing.dot +++ b/pengine/test10/bundle-order-fencing.dot @@ -114,7 +114,6 @@ digraph "g" { "rabbitmq-bundle-1_monitor_0 controller-2" [ style=bold color="green" fontcolor="black"] "rabbitmq-bundle-2_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq-bundle_running_0" [ style = bold] -"rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = bold] @@ -127,17 +126,12 @@ digraph "g" { "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" -> "rabbitmq-bundle-clone_stop_0" [ style = bold] "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-bundle-clone_post_notify_running_0" -> "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style = bold] -"rabbitmq-bundle-clone_post_notify_running_0" -> "rabbitmq_post_notify_running_0 rabbitmq-bundle-0" [ style = bold] -"rabbitmq-bundle-clone_post_notify_running_0" -> "rabbitmq_post_notify_running_0 rabbitmq-bundle-1" [ style = bold] -"rabbitmq-bundle-clone_post_notify_running_0" -> "rabbitmq_post_notify_running_0 rabbitmq-bundle-2" [ style = bold] "rabbitmq-bundle-clone_post_notify_running_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-bundle-clone_post_notify_stopped_0" -> "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" [ style = bold] "rabbitmq-bundle-clone_post_notify_stopped_0" -> "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" [ style = bold] "rabbitmq-bundle-clone_post_notify_stopped_0" -> "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-2" [ style = bold] "rabbitmq-bundle-clone_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-bundle-clone_pre_notify_start_0" -> "rabbitmq-bundle-clone_confirmed-pre_notify_start_0" [ style = bold] -"rabbitmq-bundle-clone_pre_notify_start_0" -> "rabbitmq_pre_notify_start_0 rabbitmq-bundle-1" [ style = bold] -"rabbitmq-bundle-clone_pre_notify_start_0" -> "rabbitmq_pre_notify_start_0 rabbitmq-bundle-2" [ style = bold] "rabbitmq-bundle-clone_pre_notify_start_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-bundle-clone_pre_notify_stop_0" -> "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" [ style = bold] "rabbitmq-bundle-clone_pre_notify_stop_0" -> "rabbitmq_pre_notify_stop_0 rabbitmq-bundle-1" [ style = bold] @@ -168,12 +162,6 @@ digraph "g" { "rabbitmq_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "rabbitmq_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style=dashed color="red" fontcolor="black"] -"rabbitmq_post_notify_running_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style = bold] -"rabbitmq_post_notify_running_0 rabbitmq-bundle-0" [ style=bold color="green" fontcolor="black"] -"rabbitmq_post_notify_running_0 rabbitmq-bundle-1" -> "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style = bold] -"rabbitmq_post_notify_running_0 rabbitmq-bundle-1" [ style=bold color="green" fontcolor="black"] -"rabbitmq_post_notify_running_0 rabbitmq-bundle-2" -> "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style = bold] -"rabbitmq_post_notify_running_0 rabbitmq-bundle-2" [ style=bold color="green" fontcolor="black"] "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" -> "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" [ style = bold] "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" -> "rabbitmq_confirmed-post_notify_stonith_0" [ style = bold] "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" [ style=bold color="green" fontcolor="black"] @@ -184,10 +172,6 @@ digraph "g" { "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" [ style = bold] "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-2" [ style = bold] "rabbitmq_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq_pre_notify_start_0 rabbitmq-bundle-1" -> "rabbitmq-bundle-clone_confirmed-pre_notify_start_0" [ style = bold] -"rabbitmq_pre_notify_start_0 rabbitmq-bundle-1" [ style=bold color="green" fontcolor="black"] -"rabbitmq_pre_notify_start_0 rabbitmq-bundle-2" -> "rabbitmq-bundle-clone_confirmed-pre_notify_start_0" [ style = bold] -"rabbitmq_pre_notify_start_0 rabbitmq-bundle-2" [ style=bold color="green" fontcolor="black"] "rabbitmq_pre_notify_stop_0 rabbitmq-bundle-1" -> "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" [ style = bold] "rabbitmq_pre_notify_stop_0 rabbitmq-bundle-1" [ style=bold color="green" fontcolor="black"] "rabbitmq_pre_notify_stop_0 rabbitmq-bundle-2" -> "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" [ style = bold] @@ -231,9 +215,6 @@ digraph "g" { "redis-bundle-master_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-master_confirmed-post_notify_running_0" -> "redis-bundle-master_pre_notify_promote_0" [ style = bold] "redis-bundle-master_confirmed-post_notify_running_0" -> "redis-bundle_running_0" [ style = bold] -"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_20000 redis-bundle-1" [ style = bold] -"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed] -"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_promote_0" [ style = bold] @@ -271,9 +252,6 @@ digraph "g" { "redis-bundle-master_post_notify_promoted_0" -> "redis_post_notify_promoted_0 redis-bundle-2" [ style = bold] "redis-bundle-master_post_notify_promoted_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-master_post_notify_running_0" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold] -"redis-bundle-master_post_notify_running_0" -> "redis_post_notify_running_0 redis-bundle-0" [ style = bold] -"redis-bundle-master_post_notify_running_0" -> "redis_post_notify_running_0 redis-bundle-1" [ style = bold] -"redis-bundle-master_post_notify_running_0" -> "redis_post_notify_running_0 redis-bundle-2" [ style = bold] "redis-bundle-master_post_notify_running_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-master_post_notify_stopped_0" -> "redis-bundle-master_confirmed-post_notify_stopped_0" [ style = bold] "redis-bundle-master_post_notify_stopped_0" -> "redis_post_notify_stonith_0 redis-bundle-1" [ style = bold] @@ -289,8 +267,6 @@ digraph "g" { "redis-bundle-master_pre_notify_promote_0" -> "redis_pre_notify_promote_0 redis-bundle-2" [ style = bold] "redis-bundle-master_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-master_pre_notify_start_0" -> "redis-bundle-master_confirmed-pre_notify_start_0" [ style = bold] -"redis-bundle-master_pre_notify_start_0" -> "redis_pre_notify_start_0 redis-bundle-1" [ style = bold] -"redis-bundle-master_pre_notify_start_0" -> "redis_pre_notify_start_0 redis-bundle-2" [ style = bold] "redis-bundle-master_pre_notify_start_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-master_pre_notify_stop_0" -> "redis-bundle-master_confirmed-pre_notify_stop_0" [ style = bold] "redis-bundle-master_pre_notify_stop_0" -> "redis_pre_notify_stop_0 redis-bundle-1" [ style = bold] @@ -355,12 +331,6 @@ digraph "g" { "redis_post_notify_promoted_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"] "redis_post_notify_promoted_0 redis-bundle-2" -> "redis-bundle-master_confirmed-post_notify_promoted_0" [ style = bold] "redis_post_notify_promoted_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"] -"redis_post_notify_running_0 redis-bundle-0" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold] -"redis_post_notify_running_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"] -"redis_post_notify_running_0 redis-bundle-1" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold] -"redis_post_notify_running_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"] -"redis_post_notify_running_0 redis-bundle-2" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold] -"redis_post_notify_running_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"] "redis_post_notify_stonith_0 redis-bundle-1" -> "redis-bundle-master_confirmed-post_notify_stopped_0" [ style = bold] "redis_post_notify_stonith_0 redis-bundle-1" -> "redis_confirmed-post_notify_stonith_0" [ style = bold] "redis_post_notify_stonith_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"] @@ -381,10 +351,6 @@ digraph "g" { "redis_pre_notify_promote_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"] "redis_pre_notify_promote_0 redis-bundle-2" -> "redis-bundle-master_confirmed-pre_notify_promote_0" [ style = bold] "redis_pre_notify_promote_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"] -"redis_pre_notify_start_0 redis-bundle-1" -> "redis-bundle-master_confirmed-pre_notify_start_0" [ style = bold] -"redis_pre_notify_start_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"] -"redis_pre_notify_start_0 redis-bundle-2" -> "redis-bundle-master_confirmed-pre_notify_start_0" [ style = bold] -"redis_pre_notify_start_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"] "redis_pre_notify_stop_0 redis-bundle-1" -> "redis-bundle-master_confirmed-pre_notify_stop_0" [ style = bold] "redis_pre_notify_stop_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"] "redis_pre_notify_stop_0 redis-bundle-2" -> "redis-bundle-master_confirmed-pre_notify_stop_0" [ style = bold] diff --git a/pengine/test10/bundle-order-fencing.exp b/pengine/test10/bundle-order-fencing.exp index dc4c5c9..599c299 100644 --- a/pengine/test10/bundle-order-fencing.exp +++ b/pengine/test10/bundle-order-fencing.exp @@ -1,19 +1,6 @@ - - - - - - - - - - - - - @@ -30,7 +17,7 @@ - + @@ -42,10 +29,10 @@ - + - + @@ -57,11 +44,11 @@ - + - + - + @@ -70,37 +57,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -112,11 +73,11 @@ - + - + - + @@ -125,37 +86,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -167,7 +102,7 @@ - + @@ -185,7 +120,7 @@ - + @@ -200,7 +135,7 @@ - + @@ -211,14 +146,14 @@ - + - + - + @@ -226,7 +161,7 @@ - + @@ -241,7 +176,7 @@ - + @@ -259,7 +194,7 @@ - + @@ -269,18 +204,9 @@ - - - - - - - - - - + @@ -295,7 +221,7 @@ - + @@ -305,15 +231,9 @@ - - - - - - - + @@ -325,7 +245,7 @@ - + @@ -337,7 +257,7 @@ - + @@ -355,7 +275,7 @@ - + @@ -373,7 +293,7 @@ - + @@ -381,7 +301,7 @@ - + @@ -390,7 +310,7 @@ - + @@ -399,7 +319,7 @@ - + @@ -408,7 +328,7 @@ - + @@ -417,7 +337,7 @@ - + @@ -435,7 +355,7 @@ - + @@ -447,7 +367,7 @@ - + @@ -462,7 +382,7 @@ - + @@ -474,7 +394,7 @@ - + @@ -489,7 +409,7 @@ - + @@ -507,7 +427,7 @@ - + @@ -519,7 +439,7 @@ - + @@ -537,7 +457,7 @@ - + @@ -555,7 +475,7 @@ - + @@ -563,7 +483,7 @@ - + @@ -572,7 +492,7 @@ - + @@ -581,7 +501,7 @@ - + @@ -590,7 +510,7 @@ - + @@ -599,11 +519,11 @@ - + - + - + @@ -612,11 +532,11 @@ - + - + - + @@ -625,20 +545,7 @@ - - - - - - - - - - - - - - + @@ -656,7 +563,7 @@ - + @@ -668,10 +575,10 @@ - + - + @@ -686,10 +593,10 @@ - + - + @@ -698,11 +605,11 @@ - + - + - + @@ -711,11 +618,11 @@ - + - + - + @@ -724,11 +631,11 @@ - + - + - + @@ -737,11 +644,11 @@ - + - + - + @@ -750,11 +657,11 @@ - + - + - + @@ -763,37 +670,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -805,7 +686,7 @@ - + @@ -817,9 +698,6 @@ - - - @@ -833,11 +711,11 @@ - + - + @@ -855,7 +733,7 @@ - + @@ -864,7 +742,7 @@ - + @@ -873,11 +751,11 @@ - + - + - + @@ -886,11 +764,11 @@ - + - + - + @@ -899,11 +777,11 @@ - + - + - + @@ -912,11 +790,11 @@ - + - + - + @@ -925,11 +803,11 @@ - + - + - + @@ -938,37 +816,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -980,7 +832,7 @@ - + @@ -991,14 +843,14 @@ - + - + - + @@ -1013,7 +865,7 @@ - + @@ -1024,14 +876,14 @@ - + - + - + @@ -1039,7 +891,7 @@ - + @@ -1054,7 +906,7 @@ - + @@ -1069,7 +921,7 @@ - + @@ -1080,17 +932,17 @@ - + - + - + - + @@ -1105,7 +957,7 @@ - + @@ -1116,17 +968,17 @@ - + - + - + - + @@ -1144,7 +996,7 @@ - + @@ -1156,7 +1008,7 @@ - + @@ -1180,7 +1032,7 @@ - + @@ -1198,7 +1050,7 @@ - + @@ -1213,7 +1065,7 @@ - + @@ -1224,14 +1076,14 @@ - + - + - + @@ -1243,7 +1095,7 @@ - + @@ -1258,7 +1110,7 @@ - + @@ -1279,7 +1131,7 @@ - + @@ -1289,18 +1141,9 @@ - - - - - - - - - - + @@ -1315,7 +1158,7 @@ - + @@ -1325,15 +1168,9 @@ - - - - - - - + @@ -1348,7 +1185,7 @@ - + @@ -1360,7 +1197,7 @@ - + @@ -1381,7 +1218,7 @@ - + @@ -1399,7 +1236,7 @@ - + @@ -1407,7 +1244,7 @@ - + @@ -1416,7 +1253,7 @@ - + @@ -1425,7 +1262,7 @@ - + @@ -1434,7 +1271,7 @@ - + @@ -1443,7 +1280,7 @@ - + @@ -1456,7 +1293,7 @@ - + @@ -1472,7 +1309,7 @@ - + @@ -1487,7 +1324,7 @@ - + @@ -1500,7 +1337,7 @@ - + @@ -1516,7 +1353,7 @@ - + @@ -1531,7 +1368,7 @@ - + @@ -1544,7 +1381,7 @@ - + @@ -1560,7 +1397,7 @@ - + @@ -1575,7 +1412,7 @@ - + @@ -1590,7 +1427,7 @@ - + @@ -1603,7 +1440,7 @@ - + @@ -1616,7 +1453,7 @@ - + @@ -1624,7 +1461,7 @@ - + @@ -1637,7 +1474,7 @@ - + @@ -1650,7 +1487,7 @@ - + @@ -1658,7 +1495,7 @@ - + @@ -1673,7 +1510,7 @@ - + @@ -1688,7 +1525,7 @@ - + @@ -1703,7 +1540,7 @@ - + @@ -1724,7 +1561,7 @@ - + @@ -1736,7 +1573,7 @@ - + @@ -1744,7 +1581,7 @@ - + @@ -1759,7 +1596,7 @@ - + @@ -1767,7 +1604,7 @@ - + @@ -1779,7 +1616,7 @@ - + @@ -1797,7 +1634,7 @@ - + @@ -1812,7 +1649,7 @@ - + @@ -1824,7 +1661,7 @@ - + @@ -1836,7 +1673,7 @@ - + @@ -1851,7 +1688,7 @@ - + @@ -1866,7 +1703,7 @@ - + @@ -1874,7 +1711,7 @@ - + @@ -1889,7 +1726,7 @@ - + @@ -1901,7 +1738,7 @@ - + @@ -1913,7 +1750,7 @@ - + @@ -1928,7 +1765,7 @@ - + @@ -1943,7 +1780,7 @@ - + @@ -1951,7 +1788,7 @@ - + @@ -1963,7 +1800,7 @@ - + @@ -1971,7 +1808,7 @@ - + @@ -2040,7 +1877,7 @@ - + diff --git a/pengine/test10/bundle-order-fencing.summary b/pengine/test10/bundle-order-fencing.summary index 0457f83..d398a12 100644 --- a/pengine/test10/bundle-order-fencing.summary +++ b/pengine/test10/bundle-order-fencing.summary @@ -147,8 +147,6 @@ Executing cluster transition: * Pseudo action: redis-bundle-docker-0_stop_0 * Pseudo action: rabbitmq-bundle_stopped_0 * Pseudo action: rabbitmq_notified_0 - * Resource action: rabbitmq notify on rabbitmq-bundle-1 - * Resource action: rabbitmq notify on rabbitmq-bundle-2 * Pseudo action: rabbitmq-bundle-clone_confirmed-pre_notify_start_0 * Pseudo action: rabbitmq-bundle-clone_start_0 * Pseudo action: galera-bundle-master_running_0 @@ -164,22 +162,14 @@ Executing cluster transition: * Pseudo action: redis-bundle-master_pre_notify_start_0 * Pseudo action: redis-bundle_stopped_0 * Pseudo action: redis-bundle_start_0 - * Resource action: rabbitmq notify on rabbitmq-bundle-0 - * Resource action: rabbitmq notify on rabbitmq-bundle-1 - * Resource action: rabbitmq notify on rabbitmq-bundle-2 * Pseudo action: rabbitmq-bundle-clone_confirmed-post_notify_running_0 * Pseudo action: redis_notified_0 - * Resource action: redis notify on redis-bundle-1 - * Resource action: redis notify on redis-bundle-2 * Pseudo action: redis-bundle-master_confirmed-pre_notify_start_0 * Pseudo action: redis-bundle-master_start_0 * Pseudo action: rabbitmq-bundle_running_0 * Pseudo action: all_stopped * Pseudo action: redis-bundle-master_running_0 * Pseudo action: redis-bundle-master_post_notify_running_0 - * Resource action: redis notify on redis-bundle-0 - * Resource action: redis notify on redis-bundle-1 - * Resource action: redis notify on redis-bundle-2 * Pseudo action: redis-bundle-master_confirmed-post_notify_running_0 * Pseudo action: redis-bundle_running_0 * Pseudo action: redis-bundle-master_pre_notify_promote_0 diff --git a/pengine/test10/bundle-order-partial-start-2.exp b/pengine/test10/bundle-order-partial-start-2.exp index afba801..bf9a0b0 100644 --- a/pengine/test10/bundle-order-partial-start-2.exp +++ b/pengine/test10/bundle-order-partial-start-2.exp @@ -315,7 +315,7 @@ - + @@ -328,7 +328,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -409,7 +409,7 @@ - + diff --git a/pengine/test10/bundle-order-partial-start.exp b/pengine/test10/bundle-order-partial-start.exp index cb10bad..8e28f19 100644 --- a/pengine/test10/bundle-order-partial-start.exp +++ b/pengine/test10/bundle-order-partial-start.exp @@ -296,7 +296,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -390,7 +390,7 @@ - + diff --git a/pengine/test10/bundle-order-partial-stop.dot b/pengine/test10/bundle-order-partial-stop.dot index 5d0c039..6bad4ab 100644 --- a/pengine/test10/bundle-order-partial-stop.dot +++ b/pengine/test10/bundle-order-partial-stop.dot @@ -112,7 +112,6 @@ digraph "g" { "rabbitmq-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" -> "rabbitmq-bundle-docker-0_stop_0 undercloud" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] -"rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = dashed] @@ -178,8 +177,6 @@ digraph "g" { "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"] -"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed] -"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_start_0" [ style = dashed] diff --git a/pengine/test10/bundle-order-partial-stop.exp b/pengine/test10/bundle-order-partial-stop.exp index 6119950..89d87aa 100644 --- a/pengine/test10/bundle-order-partial-stop.exp +++ b/pengine/test10/bundle-order-partial-stop.exp @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -293,7 +293,7 @@ - + @@ -306,7 +306,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -338,7 +338,7 @@ - + diff --git a/pengine/test10/bundle-order-startup-clone.dot b/pengine/test10/bundle-order-startup-clone.dot index 8426bd2..a23a2fe 100644 --- a/pengine/test10/bundle-order-startup-clone.dot +++ b/pengine/test10/bundle-order-startup-clone.dot @@ -118,9 +118,6 @@ digraph "g" { "redis:0_start_0 redis-bundle-0" -> "redis:0_monitor_60000 redis-bundle-0" [ style = bold] "redis:0_start_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"] "storage-clone_confirmed-post_notify_running_0" -> "galera-bundle_start_0" [ style = dashed] -"storage-clone_confirmed-post_notify_running_0" -> "storage:0_monitor_30000 metal-1" [ style = dashed] -"storage-clone_confirmed-post_notify_running_0" -> "storage:1_monitor_30000 metal-2" [ style = dashed] -"storage-clone_confirmed-post_notify_running_0" -> "storage:2_monitor_30000 metal-3" [ style = dashed] "storage-clone_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] "storage-clone_confirmed-pre_notify_start_0" -> "storage-clone_post_notify_running_0" [ style = dashed] "storage-clone_confirmed-pre_notify_start_0" -> "storage-clone_start_0" [ style = dashed] diff --git a/pengine/test10/bundle-order-stop-clone.exp b/pengine/test10/bundle-order-stop-clone.exp index 3e3fe77..3e66f54 100644 --- a/pengine/test10/bundle-order-stop-clone.exp +++ b/pengine/test10/bundle-order-stop-clone.exp @@ -1,7 +1,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -88,10 +88,10 @@ - + - + @@ -121,13 +121,13 @@ - + - + - + diff --git a/pengine/test10/bundle-order-stop-on-remote.exp b/pengine/test10/bundle-order-stop-on-remote.exp index db5386b..96588dc 100644 --- a/pengine/test10/bundle-order-stop-on-remote.exp +++ b/pengine/test10/bundle-order-stop-on-remote.exp @@ -588,7 +588,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -614,7 +614,7 @@ - + @@ -627,7 +627,7 @@ - + @@ -675,7 +675,7 @@ - + @@ -688,7 +688,7 @@ - + @@ -701,7 +701,7 @@ - + @@ -780,7 +780,7 @@ - + @@ -793,7 +793,7 @@ - + @@ -806,7 +806,7 @@ - + @@ -819,7 +819,7 @@ - + @@ -841,13 +841,13 @@ - + - + - + @@ -877,13 +877,13 @@ - + - + - + @@ -940,13 +940,13 @@ - + - + - + @@ -976,10 +976,10 @@ - + - + diff --git a/pengine/test10/bundle-order-stop.dot b/pengine/test10/bundle-order-stop.dot index 5d0c039..6bad4ab 100644 --- a/pengine/test10/bundle-order-stop.dot +++ b/pengine/test10/bundle-order-stop.dot @@ -112,7 +112,6 @@ digraph "g" { "rabbitmq-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" -> "rabbitmq-bundle-docker-0_stop_0 undercloud" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] -"rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = dashed] @@ -178,8 +177,6 @@ digraph "g" { "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"] -"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed] -"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_start_0" [ style = dashed] diff --git a/pengine/test10/bundle-order-stop.exp b/pengine/test10/bundle-order-stop.exp index 6119950..89d87aa 100644 --- a/pengine/test10/bundle-order-stop.exp +++ b/pengine/test10/bundle-order-stop.exp @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -293,7 +293,7 @@ - + @@ -306,7 +306,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -338,7 +338,7 @@ - + diff --git a/pengine/test10/colo_master_w_native.exp b/pengine/test10/colo_master_w_native.exp index 2803879..ffa773f 100644 --- a/pengine/test10/colo_master_w_native.exp +++ b/pengine/test10/colo_master_w_native.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -171,10 +171,10 @@ - + - + @@ -204,10 +204,10 @@ - + - + @@ -257,10 +257,10 @@ - + - + @@ -290,10 +290,10 @@ - + - + diff --git a/pengine/test10/colo_slave_w_native.exp b/pengine/test10/colo_slave_w_native.exp index e5ec984..a548923 100644 --- a/pengine/test10/colo_slave_w_native.exp +++ b/pengine/test10/colo_slave_w_native.exp @@ -36,7 +36,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -206,10 +206,10 @@ - + - + @@ -239,10 +239,10 @@ - + - + @@ -292,10 +292,10 @@ - + - + @@ -325,10 +325,10 @@ - + - + diff --git a/pengine/test10/group-dependents.exp b/pengine/test10/group-dependents.exp index 607e9d7..0df62f0 100644 --- a/pengine/test10/group-dependents.exp +++ b/pengine/test10/group-dependents.exp @@ -1262,7 +1262,7 @@ - + @@ -1275,7 +1275,7 @@ - + @@ -1288,7 +1288,7 @@ - + @@ -1301,7 +1301,7 @@ - + @@ -1346,7 +1346,7 @@ - + @@ -1359,7 +1359,7 @@ - + @@ -1372,7 +1372,7 @@ - + @@ -1385,7 +1385,7 @@ - + @@ -1432,10 +1432,10 @@ - + - + @@ -1465,10 +1465,10 @@ - + - + @@ -1521,10 +1521,10 @@ - + - + @@ -1554,10 +1554,10 @@ - + - + diff --git a/pengine/test10/inc10.exp b/pengine/test10/inc10.exp index 3779287..742d124 100644 --- a/pengine/test10/inc10.exp +++ b/pengine/test10/inc10.exp @@ -37,7 +37,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -150,13 +150,13 @@ - + - + - + @@ -186,16 +186,16 @@ - + - + - + - + diff --git a/pengine/test10/interleave-pseudo-stop.exp b/pengine/test10/interleave-pseudo-stop.exp index 63217e8..97faf46 100644 --- a/pengine/test10/interleave-pseudo-stop.exp +++ b/pengine/test10/interleave-pseudo-stop.exp @@ -43,7 +43,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -473,7 +473,7 @@ - + diff --git a/pengine/test10/interleave-stop.exp b/pengine/test10/interleave-stop.exp index a4c524f..35a8428 100644 --- a/pengine/test10/interleave-stop.exp +++ b/pengine/test10/interleave-stop.exp @@ -37,7 +37,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -134,10 +134,10 @@ - + - + @@ -184,7 +184,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -275,10 +275,10 @@ - + - + @@ -319,7 +319,7 @@ - + @@ -332,7 +332,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -380,7 +380,7 @@ - + @@ -410,10 +410,10 @@ - + - + diff --git a/pengine/test10/master-13.exp b/pengine/test10/master-13.exp index 1e09ee1..94b8d59 100644 --- a/pengine/test10/master-13.exp +++ b/pengine/test10/master-13.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -202,10 +202,10 @@ - + - + @@ -235,10 +235,10 @@ - + - + @@ -288,10 +288,10 @@ - + - + @@ -321,10 +321,10 @@ - + - + diff --git a/pengine/test10/master-demote.exp b/pengine/test10/master-demote.exp index 8909056..91cd0bc 100644 --- a/pengine/test10/master-demote.exp +++ b/pengine/test10/master-demote.exp @@ -23,7 +23,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -113,10 +113,10 @@ - + - + @@ -146,10 +146,10 @@ - + - + diff --git a/pengine/test10/master-dependent-ban.exp b/pengine/test10/master-dependent-ban.exp index 99a6e94..caea6e3 100644 --- a/pengine/test10/master-dependent-ban.exp +++ b/pengine/test10/master-dependent-ban.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -104,10 +104,10 @@ - + - + @@ -137,10 +137,10 @@ - + - + diff --git a/pengine/test10/master-failed-demote.exp b/pengine/test10/master-failed-demote.exp index 1d27dc5..7cbfdfa 100644 --- a/pengine/test10/master-failed-demote.exp +++ b/pengine/test10/master-failed-demote.exp @@ -28,7 +28,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -285,10 +285,10 @@ - + - + @@ -318,10 +318,10 @@ - + - + @@ -375,10 +375,10 @@ - + - + @@ -408,13 +408,13 @@ - + - + - + diff --git a/pengine/test10/master-move.exp b/pengine/test10/master-move.exp index e77005f..536e583 100644 --- a/pengine/test10/master-move.exp +++ b/pengine/test10/master-move.exp @@ -182,7 +182,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -383,10 +383,10 @@ - + - + @@ -416,10 +416,10 @@ - + - + @@ -472,10 +472,10 @@ - + - + @@ -505,10 +505,10 @@ - + - + diff --git a/pengine/test10/master-notify.exp b/pengine/test10/master-notify.exp index 0f6295c..7a73136 100644 --- a/pengine/test10/master-notify.exp +++ b/pengine/test10/master-notify.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -101,13 +101,13 @@ - + - + - + @@ -137,13 +137,13 @@ - + - + - + diff --git a/pengine/test10/master-partially-demoted-group.exp b/pengine/test10/master-partially-demoted-group.exp index fecf3c5..32a30fe 100644 --- a/pengine/test10/master-partially-demoted-group.exp +++ b/pengine/test10/master-partially-demoted-group.exp @@ -493,7 +493,7 @@ - + @@ -506,7 +506,7 @@ - + @@ -519,7 +519,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -590,7 +590,7 @@ - + @@ -603,7 +603,7 @@ - + @@ -616,7 +616,7 @@ - + @@ -670,10 +670,10 @@ - + - + @@ -703,10 +703,10 @@ - + - + @@ -759,10 +759,10 @@ - + - + @@ -792,10 +792,10 @@ - + - + diff --git a/pengine/test10/novell-239082.exp b/pengine/test10/novell-239082.exp index 9453656..c6d0221 100644 --- a/pengine/test10/novell-239082.exp +++ b/pengine/test10/novell-239082.exp @@ -26,7 +26,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -194,10 +194,10 @@ - + - + @@ -227,10 +227,10 @@ - + - + @@ -283,7 +283,7 @@ - + @@ -313,7 +313,7 @@ - + @@ -373,7 +373,7 @@ - + @@ -403,10 +403,10 @@ - + - + diff --git a/pengine/test10/novell-252693.exp b/pengine/test10/novell-252693.exp index 43da979..82486d2 100644 --- a/pengine/test10/novell-252693.exp +++ b/pengine/test10/novell-252693.exp @@ -77,7 +77,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -168,10 +168,10 @@ - + - + @@ -218,7 +218,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -309,10 +309,10 @@ - + - + @@ -353,7 +353,7 @@ - + @@ -366,7 +366,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -414,7 +414,7 @@ - + @@ -444,10 +444,10 @@ - + - + diff --git a/pengine/test10/one-or-more-unrunnable-instances.exp b/pengine/test10/one-or-more-unrunnable-instances.exp index 45ae3b6..ff156a4 100644 --- a/pengine/test10/one-or-more-unrunnable-instances.exp +++ b/pengine/test10/one-or-more-unrunnable-instances.exp @@ -4300,7 +4300,7 @@ - + @@ -4345,7 +4345,7 @@ - + @@ -4390,7 +4390,7 @@ - + @@ -4444,13 +4444,13 @@ - + - + - + diff --git a/pengine/test10/order_constraint_stops_master.dot b/pengine/test10/order_constraint_stops_master.dot index b2ebc9f..359d3fe 100644 --- a/pengine/test10/order_constraint_stops_master.dot +++ b/pengine/test10/order_constraint_stops_master.dot @@ -3,7 +3,6 @@ "MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "MASTER_RSC_A_pre_notify_stop_0" [ style = bold] "MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed] "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"] -"MASTER_RSC_A_confirmed-post_notify_running_0" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed] "MASTER_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed] "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder2" [ style = bold] diff --git a/pengine/test10/order_constraint_stops_master.exp b/pengine/test10/order_constraint_stops_master.exp index 551e186..22355bc 100644 --- a/pengine/test10/order_constraint_stops_master.exp +++ b/pengine/test10/order_constraint_stops_master.exp @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/pengine/test10/order_constraint_stops_slave.dot b/pengine/test10/order_constraint_stops_slave.dot index 90e1311..b7a48eb 100644 --- a/pengine/test10/order_constraint_stops_slave.dot +++ b/pengine/test10/order_constraint_stops_slave.dot @@ -1,5 +1,4 @@ digraph "g" { -"MASTER_RSC_A_confirmed-post_notify_running_0" -> "NATIVE_RSC_A:0_monitor_30000 fc16-builder" [ style = dashed] "MASTER_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed] "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder" [ style = bold] diff --git a/pengine/test10/order_constraint_stops_slave.exp b/pengine/test10/order_constraint_stops_slave.exp index 1a7d5da..96c7a72 100644 --- a/pengine/test10/order_constraint_stops_slave.exp +++ b/pengine/test10/order_constraint_stops_slave.exp @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/pengine/test10/probe-0.exp b/pengine/test10/probe-0.exp index fe866a4..d65acb6 100644 --- a/pengine/test10/probe-0.exp +++ b/pengine/test10/probe-0.exp @@ -1,7 +1,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -80,10 +80,10 @@ - + - + diff --git a/pengine/test10/probe-2.exp b/pengine/test10/probe-2.exp index e8fbcff..72cc32a 100644 --- a/pengine/test10/probe-2.exp +++ b/pengine/test10/probe-2.exp @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -203,10 +203,10 @@ - + - + @@ -236,10 +236,10 @@ - + - + @@ -292,7 +292,7 @@ - + @@ -322,7 +322,7 @@ - + @@ -382,7 +382,7 @@ - + @@ -412,10 +412,10 @@ - + - + @@ -666,7 +666,7 @@ - + @@ -679,7 +679,7 @@ - + @@ -692,7 +692,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -757,10 +757,10 @@ - + - + diff --git a/pengine/test10/remote-recover-all.exp b/pengine/test10/remote-recover-all.exp index 556ccfd..fd2cf82 100644 --- a/pengine/test10/remote-recover-all.exp +++ b/pengine/test10/remote-recover-all.exp @@ -310,7 +310,7 @@ - + @@ -339,7 +339,7 @@ - + @@ -410,10 +410,10 @@ - + - + diff --git a/pengine/test10/remote-recover-connection.exp b/pengine/test10/remote-recover-connection.exp index 40338b4..a9dd475 100644 --- a/pengine/test10/remote-recover-connection.exp +++ b/pengine/test10/remote-recover-connection.exp @@ -187,7 +187,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -287,10 +287,10 @@ - + - + diff --git a/pengine/test10/remote-recover-no-resources.exp b/pengine/test10/remote-recover-no-resources.exp index 0a57e27..09b012b 100644 --- a/pengine/test10/remote-recover-no-resources.exp +++ b/pengine/test10/remote-recover-no-resources.exp @@ -221,7 +221,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -321,10 +321,10 @@ - + - + diff --git a/pengine/test10/remote-recover-unknown.exp b/pengine/test10/remote-recover-unknown.exp index 0d7b318..0a1d170 100644 --- a/pengine/test10/remote-recover-unknown.exp +++ b/pengine/test10/remote-recover-unknown.exp @@ -221,7 +221,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -321,10 +321,10 @@ - + - + diff --git a/pengine/test10/remote-recovery.exp b/pengine/test10/remote-recovery.exp index 40338b4..a9dd475 100644 --- a/pengine/test10/remote-recovery.exp +++ b/pengine/test10/remote-recovery.exp @@ -187,7 +187,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -287,10 +287,10 @@ - + - + -- 1.8.3.1