diff --git a/crm/pengine/regression.sh b/crm/pengine/regression.sh index 15547b0d1d..691698a18e 100755 --- a/crm/pengine/regression.sh +++ b/crm/pengine/regression.sh @@ -1,108 +1,119 @@ #!/bin/bash # Copyright (C) 2004 Andrew Beekhof # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public # License as published by the Free Software Foundation; either # version 2.1 of the License, or (at your option) any later version. # # This software is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # . regression.core.sh create_mode="true" echo Generating test outputs for these tests... #do_test bad7 "Bad data" + echo "" echo Done. echo "" echo Performing the following tests... create_mode="false" do_test simple1 "Offline " do_test simple2 "Start " do_test simple3 "Start 2 " do_test simple4 "Start Failed" do_test simple6 "Stop Start " do_test simple7 "Shutdown " #do_test simple8 "Stonith " do_test simple9 "Lower version" do_test simple10 "Higher version" do_test simple11 "Priority (ne)" do_test simple12 "Priority (eq)" echo "" do_test rsc_dep1 "Must not " #do_test rsc_dep2 "Should not " do_test rsc_dep3 "Must " #do_test rsc_dep4 "Should " do_test rsc_dep5 "Must not 3 " #do_test rsc_dep6 "Should not 3" do_test rsc_dep7 "Must 3 " #do_test rsc_dep8 "Should 3 " do_test rsc_dep10 "Must (cant)" #do_test rsc_dep9 "2*MustNot 1*ShouldNot" +echo "" +do_test order1 "Order start 1" +do_test order2 "Order start 2" +do_test order3 "Order stop " + echo "" do_test agent1 "version: lt (empty)" do_test agent2 "version: eq " do_test agent3 "version: gt " echo "" do_test attrs1 "string: eq (and) " do_test attrs2 "string: lt / gt (and)" do_test attrs3 "string: ne (or) " do_test attrs4 "string: exists " do_test attrs5 "string: notexists " echo "" do_test nodefail1 "Node Fail - Fence " do_test nodefail5 "Node Fail - Fence2Block" do_test nodefail4 "Node Fail - Block&Fence" do_test nodefail2 "Node Fail - Block " do_test nodefail3 "Node Fail - Ignore " echo "" do_test stopfail1 "Stop Fail - Disabled " do_test stopfail9 "Stop Fail - Enabled, 1 node" do_test stopfail2 "Stop Fail - Enabled, 2 node" do_test stopfail3 "Stop Fail - Ignore (1 node)" do_test stopfail4 "Stop Fail - Ignore (2 node)" #do_test stopfail5 "Stop Fail - STONITH (pass2) " #do_test stopfail6 "Stop Fail - STONITH (pass3) " #do_test stopfail7 "Stop Fail - STONITH (should fail)" echo "" do_test rsc_location1 "Score (not running) " do_test rsc_location2 "Score (running) " do_test rsc_location3 "Score (not running/no swap)" do_test rsc_location4 "Score (running/swap) " do_test rsc_location5 "Score (running/swap 2) " echo "" do_test multi1 "Multiple Active (stop/start)" +#echo "" +#do_test complex1 "Complex " + echo "" -do_test complex1 "Complex " +do_test group1 "Group " +do_test group2 "Group + Native" + echo "" do_test bad1 "Bad node " do_test bad2 "Bad rsc " do_test bad3 "No rsc class " do_test bad4 "Bad data " do_test bad5 "Bad data " do_test bad6 "Bad lrm_rsc " do_test bad7 "No lrm " echo "" test_results diff --git a/crm/pengine/testcases/group1.exp b/crm/pengine/testcases/group1.exp new file mode 100644 index 0000000000..b6ed07f949 --- /dev/null +++ b/crm/pengine/testcases/group1.exp @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/group1.xml b/crm/pengine/testcases/group1.xml new file mode 100644 index 0000000000..63209a526a --- /dev/null +++ b/crm/pengine/testcases/group1.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/group2.exp b/crm/pengine/testcases/group2.exp new file mode 100644 index 0000000000..f7fb7cb2c4 --- /dev/null +++ b/crm/pengine/testcases/group2.exp @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/group2.xml b/crm/pengine/testcases/group2.xml new file mode 100644 index 0000000000..7f88046ba8 --- /dev/null +++ b/crm/pengine/testcases/group2.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/group3.xml b/crm/pengine/testcases/group3.xml new file mode 100644 index 0000000000..4d0549a122 --- /dev/null +++ b/crm/pengine/testcases/group3.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/order1.exp b/crm/pengine/testcases/order1.exp new file mode 100644 index 0000000000..cd6d30204d --- /dev/null +++ b/crm/pengine/testcases/order1.exp @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/order1.xml b/crm/pengine/testcases/order1.xml new file mode 100644 index 0000000000..2db3f8c709 --- /dev/null +++ b/crm/pengine/testcases/order1.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/order2.exp b/crm/pengine/testcases/order2.exp new file mode 100644 index 0000000000..70419fb6a4 --- /dev/null +++ b/crm/pengine/testcases/order2.exp @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/order2.xml b/crm/pengine/testcases/order2.xml new file mode 100644 index 0000000000..7ec81cc768 --- /dev/null +++ b/crm/pengine/testcases/order2.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/order3.exp b/crm/pengine/testcases/order3.exp new file mode 100644 index 0000000000..aef1a49d6b --- /dev/null +++ b/crm/pengine/testcases/order3.exp @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/order3.xml b/crm/pengine/testcases/order3.xml new file mode 100644 index 0000000000..1d47fff272 --- /dev/null +++ b/crm/pengine/testcases/order3.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +