File pacemaker-crm_ticket-tests-update.diff of Package pacemaker

commit 729f23fc8b3ba8f11608c5b9f6b44efe89f25db7
Author: Gao,Yan <ygao@suse.com>
Date:   Fri Mar 23 18:08:53 2012 +0800

    Low: Tools: Update CLI regression tests for the new crm_ticket

diff --git a/tools/regression.exp b/tools/regression.exp
index 9c672fb..af3fed9 100755
--- a/tools/regression.exp
+++ b/tools/regression.exp
@@ -806,7 +806,7 @@ Error performing operation: The object/attribute does not exist
   </status>
 </cib>
 * Passed: crm_resource   - Un-migrate a resource
-scope=tickets  name=granted-ticket-ticketA value=false
+false
 <cib epoch="18" num_updates="1" admin_epoch="0" validate-with="pacemaker-1.2" >
   <configuration>
     <crm_config>
@@ -877,14 +877,12 @@ scope=tickets  name=granted-ticket-ticketA value=false
       </transient_attributes>
     </node_state>
     <tickets>
-      <instance_attributes id="status-tickets">
-        <nvpair id="status-tickets-granted-ticket-ticketA" name="granted-ticket-ticketA" value="false"/>
-      </instance_attributes>
+      <ticket_state id="ticketA" granted="false"/>
     </tickets>
   </status>
 </cib>
 * Passed: crm_ticket     - Set granted-ticket value
-scope=tickets  name=granted-ticket-ticketA value=false
+false
 <cib epoch="18" num_updates="2" admin_epoch="0" validate-with="pacemaker-1.2" >
   <configuration>
     <crm_config>
@@ -919,13 +917,12 @@ scope=tickets  name=granted-ticket-ticketA value=false
       </transient_attributes>
     </node_state>
     <tickets>
-      <instance_attributes id="status-tickets">
-        <nvpair id="status-tickets-granted-ticket-ticketA" name="granted-ticket-ticketA" value="false"/>
-      </instance_attributes>
+      <ticket_state id="ticketA" granted="false"/>
     </tickets>
   </status>
 </cib>
 * Passed: crm_ticket     - Query granted-ticket value
+Deleted ticketA state attribute:  name=granted
 <cib epoch="18" num_updates="3" admin_epoch="0" validate-with="pacemaker-1.2" >
   <configuration>
     <crm_config>
@@ -960,7 +957,7 @@ scope=tickets  name=granted-ticket-ticketA value=false
       </transient_attributes>
     </node_state>
     <tickets>
-      <instance_attributes id="status-tickets"/>
+      <ticket_state id="ticketA"/>
     </tickets>
   </status>
 </cib>
diff --git a/tools/regression.sh b/tools/regression.sh
index a6893dc..e8844ec 100755
--- a/tools/regression.sh
+++ b/tools/regression.sh
@@ -170,17 +170,17 @@ function test_tools() {
     $VALGRIND_CMD crm_resource -r dummy -U
     assert $? 0 crm_resource "Un-migrate a resource"
 
-    crm_ticket -t ticketA -G
-    assert $? 0 crm_ticket "Default granted-ticket value"
+    crm_ticket -t ticketA -G granted -d false
+    assert $? 0 crm_ticket "Default ticket state attribute"
 
-    crm_ticket -t ticketA -v false --force
-    assert $? 0 crm_ticket "Set granted-ticket value"
+    crm_ticket -t ticketA -r --force
+    assert $? 0 crm_ticket "Set ticket state attribute"
 
-    crm_ticket -t ticketA -G
-    assert $? 0 crm_ticket "Query granted-ticket value"
+    crm_ticket -t ticketA -G granted
+    assert $? 0 crm_ticket "Query ticket state attribute"
     
-    crm_ticket -t ticketA -D --force
-    assert $? 0 crm_ticket "Delete granted-ticket value"
+    crm_ticket -t ticketA -D granted --force
+    assert $? 0 crm_ticket "Delete ticket state attribute"
  }
 
 test_tools 2>&1 | sed s/cib-last-written.*\>/\>/ > $test_home/regression.out