From a762df8a8c64f8a197014ace5d65ca756a2adc9d Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Fri, 24 Feb 2017 11:21:21 -0600 Subject: [PATCH] Test: pengine: update regression tests for new operation name --- pengine/test10/bug-5025-4.dot | 2 +- pengine/test10/bug-5025-4.exp | 2 +- pengine/test10/bug-lf-2106.dot | 2 +- pengine/test10/bug-lf-2106.exp | 4 ++-- pengine/test10/expire-non-blocked-failure.dot | 2 +- pengine/test10/expire-non-blocked-failure.exp | 2 +- pengine/test10/failcount-block.dot | 6 +++--- pengine/test10/failcount-block.exp | 6 +++--- pengine/test10/failcount.dot | 4 ++-- pengine/test10/failcount.exp | 4 ++-- pengine/test10/orphan-2.dot | 8 ++++---- pengine/test10/orphan-2.exp | 8 ++++---- pengine/test10/whitebox-orphan-ms.dot | 6 +++--- pengine/test10/whitebox-orphaned.dot | 8 ++++---- pengine/test10/whitebox-orphaned.exp | 8 ++++---- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pengine/test10/bug-5025-4.dot b/pengine/test10/bug-5025-4.dot index 20a526f..95e65f5 100644 --- a/pengine/test10/bug-5025-4.dot +++ b/pengine/test10/bug-5025-4.dot @@ -1,5 +1,5 @@ digraph "g" { -"remote-node_clear_failcount 18builder" [ style=bold color="green" fontcolor="black"] +"remote-node_clear_failcount_0 18builder" [ style=bold color="green" fontcolor="black"] "remote-node_delete_0 18builder" -> "remote-node_start_0 18builder" [ style = bold] "remote-node_delete_0 18builder" [ style=bold color="green" fontcolor="black"] "remote-node_monitor_30000 18builder" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/bug-5025-4.exp b/pengine/test10/bug-5025-4.exp index a51c888..586c540 100644 --- a/pengine/test10/bug-5025-4.exp +++ b/pengine/test10/bug-5025-4.exp @@ -36,7 +36,7 @@ - + diff --git a/pengine/test10/bug-lf-2106.dot b/pengine/test10/bug-lf-2106.dot index dc36dcf..9799892 100644 --- a/pengine/test10/bug-lf-2106.dot +++ b/pengine/test10/bug-lf-2106.dot @@ -1,6 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"pingd:0_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] +"pingd:0_clear_failcount_0 cl-virt-1" [ style=bold color="green" fontcolor="black"] "pingd:0_clear_failcount_0 cl-virt-2" [ style=bold color="green" fontcolor="black"] "pingd:0_monitor_30000 cl-virt-1" [ style=bold color="green" fontcolor="black" ] "pingd:0_monitor_30000 cl-virt-2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/bug-lf-2106.exp b/pengine/test10/bug-lf-2106.exp index f7d4900..18b6673 100644 --- a/pengine/test10/bug-lf-2106.exp +++ b/pengine/test10/bug-lf-2106.exp @@ -43,7 +43,7 @@ - + @@ -94,7 +94,7 @@ - + diff --git a/pengine/test10/expire-non-blocked-failure.dot b/pengine/test10/expire-non-blocked-failure.dot index d449c7e..8de80a5 100644 --- a/pengine/test10/expire-non-blocked-failure.dot +++ b/pengine/test10/expire-non-blocked-failure.dot @@ -1,3 +1,3 @@ digraph "g" { -"rsc2_clear_failcount node1" [ style=bold color="green" fontcolor="black"] +"rsc2_clear_failcount_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/expire-non-blocked-failure.exp b/pengine/test10/expire-non-blocked-failure.exp index c21fb9d..32bedc8 100644 --- a/pengine/test10/expire-non-blocked-failure.exp +++ b/pengine/test10/expire-non-blocked-failure.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/failcount-block.dot b/pengine/test10/failcount-block.dot index c45ebad..7101861 100644 --- a/pengine/test10/failcount-block.dot +++ b/pengine/test10/failcount-block.dot @@ -1,12 +1,12 @@ digraph "g" { -"rsc_pcmk-1_clear_failcount pcmk-1" [ style=bold color="green" fontcolor="black"] +"rsc_pcmk-1_clear_failcount_0 pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-1_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black"] -"rsc_pcmk-3_clear_failcount pcmk-1" [ style=bold color="green" fontcolor="black"] +"rsc_pcmk-3_clear_failcount_0 pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-3_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-3_start_0 pcmk-1" -> "rsc_pcmk-3_monitor_5000 pcmk-1" [ style = bold] "rsc_pcmk-3_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-4_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black"] "rsc_pcmk-4_start_0 pcmk-1" -> "rsc_pcmk-4_monitor_5000 pcmk-1" [ style = bold] "rsc_pcmk-4_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"rsc_pcmk-5_clear_failcount pcmk-1" [ style=bold color="green" fontcolor="black"] +"rsc_pcmk-5_clear_failcount_0 pcmk-1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/failcount-block.exp b/pengine/test10/failcount-block.exp index ca27afa..dd6b8c7 100644 --- a/pengine/test10/failcount-block.exp +++ b/pengine/test10/failcount-block.exp @@ -10,7 +10,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/pengine/test10/failcount.dot b/pengine/test10/failcount.dot index 41966ad..10ef996 100644 --- a/pengine/test10/failcount.dot +++ b/pengine/test10/failcount.dot @@ -1,6 +1,6 @@ digraph "g" { "re-named-lsb:0_monitor_10000 dresproddns02" [ style=bold color="green" fontcolor="black"] "re-named-lsb:1_monitor_10000 dresproddns01" [ style=bold color="green" fontcolor="black"] -"re-openfire-lsb:0_clear_failcount dresproddns01" [ style=bold color="green" fontcolor="black"] -"re-openfire-lsb:1_clear_failcount dresproddns02" [ style=bold color="green" fontcolor="black"] +"re-openfire-lsb:0_clear_failcount_0 dresproddns01" [ style=bold color="green" fontcolor="black"] +"re-openfire-lsb:1_clear_failcount_0 dresproddns02" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/failcount.exp b/pengine/test10/failcount.exp index d64c632..e3d7c40 100644 --- a/pengine/test10/failcount.exp +++ b/pengine/test10/failcount.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/orphan-2.dot b/pengine/test10/orphan-2.dot index 2fc1e43..1a4e057 100644 --- a/pengine/test10/orphan-2.dot +++ b/pengine/test10/orphan-2.dot @@ -15,10 +15,10 @@ digraph "g" { "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"] "rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black"] -"rsc_c001n08_clear_failcount c001n02" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] -"rsc_c001n08_clear_failcount c001n02" [ style=bold color="green" fontcolor="black"] -"rsc_c001n08_clear_failcount c001n08" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] -"rsc_c001n08_clear_failcount c001n08" [ style=bold color="green" fontcolor="black"] +"rsc_c001n08_clear_failcount_0 c001n02" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] +"rsc_c001n08_clear_failcount_0 c001n02" [ style=bold color="green" fontcolor="black"] +"rsc_c001n08_clear_failcount_0 c001n08" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] +"rsc_c001n08_clear_failcount_0 c001n08" [ style=bold color="green" fontcolor="black"] "rsc_c001n08_delete_0 c001n08" [ style=bold color="green" fontcolor="black"] "rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n08" [ style = bold] diff --git a/pengine/test10/orphan-2.exp b/pengine/test10/orphan-2.exp index a0ad50e..90042e7 100644 --- a/pengine/test10/orphan-2.exp +++ b/pengine/test10/orphan-2.exp @@ -143,16 +143,16 @@ - + - + - + @@ -161,7 +161,7 @@ - + diff --git a/pengine/test10/whitebox-orphan-ms.dot b/pengine/test10/whitebox-orphan-ms.dot index 5ef3919..46b6cda 100644 --- a/pengine/test10/whitebox-orphan-ms.dot +++ b/pengine/test10/whitebox-orphan-ms.dot @@ -25,9 +25,9 @@ "container2_stop_0 18node1" -> "container2_delete_0 18node2" [ style = bold] "container2_stop_0 18node1" -> "container2_delete_0 18node3" [ style = bold] "container2_stop_0 18node1" [ style=bold color="green" fontcolor="black"] -"lxc-ms_clear_failcount lxc1" -> "lxc-ms_stop_0 lxc1" [ style = dashed] -"lxc-ms_clear_failcount lxc1" -> "lxc-ms_stop_0 lxc2" [ style = dashed] -"lxc-ms_clear_failcount lxc1" [ style=dashed color="red" fontcolor="black"] +"lxc-ms_clear_failcount_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = dashed] +"lxc-ms_clear_failcount_0 lxc1" -> "lxc-ms_stop_0 lxc2" [ style = dashed] +"lxc-ms_clear_failcount_0 lxc1" [ style=dashed color="red" fontcolor="black"] "lxc-ms_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc-ms_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc-ms_delete_0 18node3" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/whitebox-orphaned.dot b/pengine/test10/whitebox-orphaned.dot index 9405fe7..e50252d 100644 --- a/pengine/test10/whitebox-orphaned.dot +++ b/pengine/test10/whitebox-orphaned.dot @@ -15,8 +15,8 @@ "M_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold] "M_stop_0 lxc1" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] -"container1_clear_failcount 18node2" -> "container1_stop_0 18node2" [ style = bold] -"container1_clear_failcount 18node2" [ style=bold color="green" fontcolor="black"] +"container1_clear_failcount_0 18node2" -> "container1_stop_0 18node2" [ style = bold] +"container1_clear_failcount_0 18node2" [ style=bold color="green" fontcolor="black"] "container1_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "container1_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "container1_delete_0 18node3" [ style=bold color="green" fontcolor="black"] @@ -25,8 +25,8 @@ "container1_stop_0 18node2" -> "container1_delete_0 18node2" [ style = bold] "container1_stop_0 18node2" -> "container1_delete_0 18node3" [ style = bold] "container1_stop_0 18node2" [ style=bold color="green" fontcolor="black"] -"lxc1_clear_failcount 18node2" -> "lxc1_stop_0 18node2" [ style = bold] -"lxc1_clear_failcount 18node2" [ style=bold color="green" fontcolor="black"] +"lxc1_clear_failcount_0 18node2" -> "lxc1_stop_0 18node2" [ style = bold] +"lxc1_clear_failcount_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc1_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_delete_0 18node3" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/whitebox-orphaned.exp b/pengine/test10/whitebox-orphaned.exp index 2d70aed..32f8141 100644 --- a/pengine/test10/whitebox-orphaned.exp +++ b/pengine/test10/whitebox-orphaned.exp @@ -79,7 +79,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -158,7 +158,7 @@ - + -- 1.8.3.1