commit d4c8712bfcf95eeb746887f1fc3de73ca878528a
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Fri Feb 28 11:03:10 2014 +1100

    Update regression tests for bz1069284 fix

diff --git a/pengine/test10/bug-lf-2435.dot b/pengine/test10/bug-lf-2435.dot
index 2313c38..2d0b65d 100644
--- a/pengine/test10/bug-lf-2435.dot
+++ b/pengine/test10/bug-lf-2435.dot
@@ -5,6 +5,7 @@ digraph "g" {
 "dummy2_stop_0 c20.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold]
 "dummy2_stop_0 c20.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "dummy3_stop_0 c21.chepkov.lan" -> "all_stopped" [ style = bold]
+"dummy3_stop_0 c21.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold]
 "dummy3_stop_0 c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "dummy4_monitor_0 c19.chepkov.lan" -> "probe_complete c19.chepkov.lan" [ style = bold]
 "dummy4_monitor_0 c19.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
diff --git a/pengine/test10/bug-lf-2435.exp b/pengine/test10/bug-lf-2435.exp
index 046dd97..7255127 100644
--- a/pengine/test10/bug-lf-2435.exp
+++ b/pengine/test10/bug-lf-2435.exp
@@ -10,6 +10,9 @@
       <trigger>
         <rsc_op id="11" operation="stop" operation_key="dummy2_stop_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/>
       </trigger>
+      <trigger>
+        <rsc_op id="13" operation="stop" operation_key="dummy3_stop_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/>
+      </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
diff --git a/pengine/test10/simple6.dot b/pengine/test10/simple6.dot
index ac3c495..3fac608 100644
--- a/pengine/test10/simple6.dot
+++ b/pengine/test10/simple6.dot
@@ -6,6 +6,7 @@
 "probe_complete" -> "rsc2_start_0 node1" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
+"rsc1_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
diff --git a/pengine/test10/simple6.exp b/pengine/test10/simple6.exp
index 590e64b..79d230d 100644
--- a/pengine/test10/simple6.exp
+++ b/pengine/test10/simple6.exp
@@ -10,6 +10,9 @@
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
+      <trigger>
+        <rsc_op id="6" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+      </trigger>
      </inputs>
    </synapse>
   <synapse id="1" priority="2">
diff --git a/pengine/test10/simple6.summary b/pengine/test10/simple6.summary
index 2c4079b..42dde4a 100644
--- a/pengine/test10/simple6.summary
+++ b/pengine/test10/simple6.summary
@@ -12,9 +12,9 @@ Transition Summary:
 Executing cluster transition:
  * Resource action: rsc2            monitor on node1
  * Pseudo action:   probe_complete
- * Resource action: rsc2            start on node1
  * Resource action: rsc1            stop on node1
  * Pseudo action:   all_stopped
+ * Resource action: rsc2            start on node1
 
 Revised cluster status:
 Online: [ node1 ]
diff --git a/tools/regression.exp b/tools/regression.exp
index ef27353..1682f72 100755
--- a/tools/regression.exp
+++ b/tools/regression.exp
@@ -1317,7 +1317,7 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score
       <primitive id="Fence" class="stonith" type="fence_true"/>
     </resources>
     <constraints>
-      <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" node="node1" score="-INFINITY"/>
+      <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" role="Started" node="node1" score="-INFINITY"/>
     </constraints>
   </configuration>
   <status>
@@ -2027,7 +2027,7 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score
       <primitive id="Fence" class="stonith" type="fence_true"/>
     </resources>
     <constraints>
-      <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" node="node1" score="-INFINITY"/>
+      <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" role="Started" node="node1" score="-INFINITY"/>
     </constraints>
   </configuration>
   <status>
@@ -2113,8 +2113,8 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node2' with a score
       <primitive id="Fence" class="stonith" type="fence_true"/>
     </resources>
     <constraints>
-      <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" node="node1" score="-INFINITY"/>
-      <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" node="node2" score="-INFINITY"/>
+      <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" role="Started" node="node1" score="-INFINITY"/>
+      <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" role="Started" node="node2" score="-INFINITY"/>
     </constraints>
   </configuration>
   <status>
@@ -2217,8 +2217,8 @@ Online: [ node1 node2 node3 ]
       <primitive id="Fence" class="stonith" type="fence_true"/>
     </resources>
     <constraints>
-      <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" node="node1" score="-INFINITY"/>
-      <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" node="node2" score="-INFINITY"/>
+      <rsc_location id="cli-ban-dummy-on-node1" rsc="dummy" role="Started" node="node1" score="-INFINITY"/>
+      <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" role="Started" node="node2" score="-INFINITY"/>
     </constraints>
   </configuration>
   <status>
@@ -2300,8 +2300,8 @@ Online: [ node1 node2 node3 ]
       <primitive id="Fence" class="stonith" type="fence_true"/>
     </resources>
     <constraints>
-      <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" node="node2" score="-INFINITY"/>
-      <rsc_location id="cli-prefer-dummy" rsc="dummy" node="node1" score="INFINITY"/>
+      <rsc_location id="cli-ban-dummy-on-node2" rsc="dummy" role="Started" node="node2" score="-INFINITY"/>
+      <rsc_location id="cli-prefer-dummy" rsc="dummy" role="Started" node="node1" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
@@ -2383,7 +2383,7 @@ Online: [ node1 node2 node3 ]
       <primitive id="Fence" class="stonith" type="fence_true"/>
     </resources>
     <constraints>
-      <rsc_location id="cli-prefer-dummy" rsc="dummy" node="node1" score="INFINITY"/>
+      <rsc_location id="cli-prefer-dummy" rsc="dummy" role="Started" node="node1" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>