diff options
| author | Martin Schwenke <martin@meltin.net> | 2016-07-07 16:22:59 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2016-07-25 21:29:43 +0200 |
| commit | c6f36b5b29e05c6dd78abdd122958bcbc208c80c (patch) | |
| tree | da7c3ebdffafa73b38a77634ca0084688e403448 /ctdb/tests/tool | |
| parent | 2a855903de1a42bd4e806688ed9e4497e1728cfa (diff) | |
| download | samba-c6f36b5b29e05c6dd78abdd122958bcbc208c80c.tar.gz | |
ctdb-tests: Require setup_ctdbd() call in tool tests
This makes the ctdbd setup explicit and allows multiple calls to
simple_test() in the same test without ugly re-initialisation.
While here drop any unneeded ctdbd initialisation, such as VNNMAP and
IFACES. These have often been needlessly present, cluttering the
tests.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests/tool')
45 files changed, 307 insertions, 685 deletions
diff --git a/ctdb/tests/tool/ctdb.getcapabilities.001.sh b/ctdb/tests/tool/ctdb.getcapabilities.001.sh index e924d5ad2fb..d04db04b60d 100755 --- a/ctdb/tests/tool/ctdb.getcapabilities.001.sh +++ b/ctdb/tests/tool/ctdb.getcapabilities.001.sh @@ -4,25 +4,16 @@ define_test "3 nodes, all ok" -required_result 0 <<EOF -RECMASTER: YES -LMASTER: YES -EOF - -simple_test <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 +EOF -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 +required_result 0 <<EOF +RECMASTER: YES +LMASTER: YES EOF + +simple_test diff --git a/ctdb/tests/tool/ctdb.getcapabilities.002.sh b/ctdb/tests/tool/ctdb.getcapabilities.002.sh index 9a5d9803355..f54786290e5 100755 --- a/ctdb/tests/tool/ctdb.getcapabilities.002.sh +++ b/ctdb/tests/tool/ctdb.getcapabilities.002.sh @@ -4,25 +4,16 @@ define_test "3 nodes, 1 disconnected" -required_result 0 <<EOF -RECMASTER: YES -LMASTER: YES -EOF - -simple_test <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x1 2 192.168.20.43 0x0 +EOF -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 +required_result 0 <<EOF +RECMASTER: YES +LMASTER: YES EOF + +simple_test diff --git a/ctdb/tests/tool/ctdb.getcapabilities.003.sh b/ctdb/tests/tool/ctdb.getcapabilities.003.sh index 1de3cfde1ab..f087141454e 100755 --- a/ctdb/tests/tool/ctdb.getcapabilities.003.sh +++ b/ctdb/tests/tool/ctdb.getcapabilities.003.sh @@ -4,34 +4,25 @@ define_test "3 nodes, current disconnected" -required_result 1 <<EOF -../client/ctdb_client.c:293 Failed to connect client socket to daemon. Errno:No such file or directory(2) -../common/cmdline.c:167 Failed to connect to daemon -Failed to init ctdb -Failed to detect which PNN this node is -Is this node part of a CTDB cluster? -EOF - setup_nodes <<EOF 192.168.20.41 192.168.20.42 192.168.20.43 EOF -simple_test <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x1 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 +EOF -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 +required_result 1 <<EOF +../client/ctdb_client.c:293 Failed to connect client socket to daemon. Errno:No such file or directory(2) +../common/cmdline.c:167 Failed to connect to daemon +Failed to init ctdb +Failed to detect which PNN this node is +Is this node part of a CTDB cluster? EOF + +simple_test diff --git a/ctdb/tests/tool/ctdb.getcapabilities.004.sh b/ctdb/tests/tool/ctdb.getcapabilities.004.sh index 077b34ecceb..ae4ad2b5246 100755 --- a/ctdb/tests/tool/ctdb.getcapabilities.004.sh +++ b/ctdb/tests/tool/ctdb.getcapabilities.004.sh @@ -4,48 +4,36 @@ define_test "3 nodes, all ok, non-default capabilities" -set -e - -input="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x0 -CTDB_CAP_LMASTER 2 192.168.20.43 0x0 -CTDB_CAP_RECMASTER +EOF -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2" +# node 0 required_result 0 <<EOF RECMASTER: YES LMASTER: YES EOF -simple_test -n 0 <<EOF -$input -EOF +simple_test -n 0 + +# node 1 required_result 0 <<EOF RECMASTER: YES LMASTER: NO EOF -simple_test -n 1 <<EOF -$input -EOF +simple_test -n 1 + +# node 2 required_result 0 <<EOF RECMASTER: NO LMASTER: YES EOF -simple_test -n 2 <<EOF -$input -EOF +simple_test -n 2 diff --git a/ctdb/tests/tool/ctdb.listnodes.001.sh b/ctdb/tests/tool/ctdb.listnodes.001.sh index 618e0e7fe62..10fd9496de7 100755 --- a/ctdb/tests/tool/ctdb.listnodes.001.sh +++ b/ctdb/tests/tool/ctdb.listnodes.001.sh @@ -16,5 +16,4 @@ required_result 255 <<EOF ${TEST_DATE_STAMP}Failed to read nodes file "${CTDB_NODES}" EOF -simple_test <<EOF -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.listnodes.002.sh b/ctdb/tests/tool/ctdb.listnodes.002.sh index d807e1ee268..95315d75b64 100755 --- a/ctdb/tests/tool/ctdb.listnodes.002.sh +++ b/ctdb/tests/tool/ctdb.listnodes.002.sh @@ -16,5 +16,4 @@ required_result 0 <<EOF 192.168.20.43 EOF -simple_test <<EOF -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.lvs.001.sh b/ctdb/tests/tool/ctdb.lvs.001.sh index 3e864625e23..411072c5da4 100755 --- a/ctdb/tests/tool/ctdb.lvs.001.sh +++ b/ctdb/tests/tool/ctdb.lvs.001.sh @@ -7,47 +7,30 @@ define_test "3 nodes, no LVS, all ok" setup_lvs <<EOF EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 -" +EOF ##### required_result 255 <<EOF EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### required_result 0 <<EOF EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### required_result 0 <<EOF EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.lvs.002.sh b/ctdb/tests/tool/ctdb.lvs.002.sh index ed9f450aee6..5344b166a4e 100755 --- a/ctdb/tests/tool/ctdb.lvs.002.sh +++ b/ctdb/tests/tool/ctdb.lvs.002.sh @@ -10,23 +10,12 @@ setup_lvs <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 0 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -46,9 +33,7 @@ required_result 0 <<EOF 2 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -58,6 +43,4 @@ pnn:1 192.168.20.42 OK pnn:2 192.168.20.43 OK EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.lvs.003.sh b/ctdb/tests/tool/ctdb.lvs.003.sh index 54f8f17d14c..c3d1f7221f1 100755 --- a/ctdb/tests/tool/ctdb.lvs.003.sh +++ b/ctdb/tests/tool/ctdb.lvs.003.sh @@ -9,32 +9,20 @@ setup_lvs <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 +EOF -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 -" ##### required_result 0 <<EOF 0 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -43,9 +31,7 @@ required_result 0 <<EOF 2 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -54,6 +40,4 @@ pnn:0 192.168.20.41 OK (THIS NODE) pnn:2 192.168.20.43 OK EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.lvs.004.sh b/ctdb/tests/tool/ctdb.lvs.004.sh index 8f43936bcaf..ea1d1887fe6 100755 --- a/ctdb/tests/tool/ctdb.lvs.004.sh +++ b/ctdb/tests/tool/ctdb.lvs.004.sh @@ -10,23 +10,12 @@ setup_lvs <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x2 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 1 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -45,9 +32,7 @@ required_result 0 <<EOF 2 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -57,6 +42,4 @@ pnn:1 192.168.20.42 OK pnn:2 192.168.20.43 OK EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.lvs.005.sh b/ctdb/tests/tool/ctdb.lvs.005.sh index 65a39d55bf7..592224863ea 100755 --- a/ctdb/tests/tool/ctdb.lvs.005.sh +++ b/ctdb/tests/tool/ctdb.lvs.005.sh @@ -10,23 +10,12 @@ setup_lvs <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x2 CURRENT RECMASTER 1 192.168.20.42 0x2 2 192.168.20.43 0x2 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 0 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -46,9 +33,7 @@ required_result 0 <<EOF 2 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -58,6 +43,4 @@ pnn:1 192.168.20.42 UNHEALTHY pnn:2 192.168.20.43 UNHEALTHY EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.lvs.006.sh b/ctdb/tests/tool/ctdb.lvs.006.sh index f6ff2b988c9..2f9859a6be8 100755 --- a/ctdb/tests/tool/ctdb.lvs.006.sh +++ b/ctdb/tests/tool/ctdb.lvs.006.sh @@ -10,23 +10,12 @@ setup_lvs <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x4 CURRENT RECMASTER 1 192.168.20.42 0x4 2 192.168.20.43 0x2 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 2 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -44,9 +31,7 @@ required_result 0 <<EOF 2 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -56,6 +41,4 @@ pnn:1 192.168.20.42 DISABLED pnn:2 192.168.20.43 UNHEALTHY EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.lvs.007.sh b/ctdb/tests/tool/ctdb.lvs.007.sh index 6951283571b..dd47b9e69ca 100755 --- a/ctdb/tests/tool/ctdb.lvs.007.sh +++ b/ctdb/tests/tool/ctdb.lvs.007.sh @@ -10,41 +10,26 @@ setup_lvs <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x4 CURRENT RECMASTER 1 192.168.20.42 0x4 2 192.168.20.43 0x4 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 -" +EOF ##### required_result 255 <<EOF EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### required_result 0 <<EOF EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -54,6 +39,4 @@ pnn:1 192.168.20.42 DISABLED pnn:2 192.168.20.43 DISABLED EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.lvs.008.sh b/ctdb/tests/tool/ctdb.lvs.008.sh index 7323c74e9ed..aedd507d858 100755 --- a/ctdb/tests/tool/ctdb.lvs.008.sh +++ b/ctdb/tests/tool/ctdb.lvs.008.sh @@ -13,23 +13,12 @@ EOF setup_lvs <<EOF EOF -ctdb_state="\ +setup_ctdb <<EOF NODEMAP 0 192.168.20.41 0x1 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 -" +EOF ##### @@ -41,9 +30,7 @@ Failed to detect which PNN this node is Is this node part of a CTDB cluster? EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -55,9 +42,7 @@ Failed to detect which PNN this node is Is this node part of a CTDB cluster? EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -69,9 +54,7 @@ Failed to detect which PNN this node is Is this node part of a CTDB cluster? EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -83,6 +66,4 @@ Failed to detect which PNN this node is Is this node part of a CTDB cluster? EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.natgw.001.sh b/ctdb/tests/tool/ctdb.natgw.001.sh index 16753d24081..b73ce24c986 100755 --- a/ctdb/tests/tool/ctdb.natgw.001.sh +++ b/ctdb/tests/tool/ctdb.natgw.001.sh @@ -10,23 +10,12 @@ setup_natgw <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: - -VNNMAP -654321 -0 -1 -2 -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 0 192.168.20.41 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -46,9 +33,7 @@ required_result 0 <<EOF 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -58,6 +43,4 @@ pnn:1 192.168.20.42 OK pnn:2 192.168.20.43 OK EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.natgw.002.sh b/ctdb/tests/tool/ctdb.natgw.002.sh index ce36c951afa..259c8695e64 100755 --- a/ctdb/tests/tool/ctdb.natgw.002.sh +++ b/ctdb/tests/tool/ctdb.natgw.002.sh @@ -10,23 +10,12 @@ setup_natgw <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x2 1 192.168.20.42 0x0 CURRENT RECMASTER 2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -1 -2 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 1 192.168.20.42 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -46,9 +33,7 @@ required_result 0 <<EOF 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -58,7 +43,4 @@ pnn:1 192.168.20.42 OK (THIS NODE) pnn:2 192.168.20.43 OK EOF -simple_test status <<EOF -$ctdb_state -EOF - +simple_test status diff --git a/ctdb/tests/tool/ctdb.natgw.003.sh b/ctdb/tests/tool/ctdb.natgw.003.sh index 7d280ac04fb..af48b48c622 100755 --- a/ctdb/tests/tool/ctdb.natgw.003.sh +++ b/ctdb/tests/tool/ctdb.natgw.003.sh @@ -9,23 +9,12 @@ setup_natgw <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x2 1 192.168.20.42 0x0 CURRENT RECMASTER 2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -1 -2 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: -" +EOF ##### @@ -33,9 +22,7 @@ required_result 0 <<EOF 2 192.168.20.43 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -44,9 +31,7 @@ required_result 0 <<EOF 192.168.20.43 MASTER EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -55,6 +40,4 @@ pnn:0 192.168.20.41 UNHEALTHY pnn:2 192.168.20.43 OK EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.natgw.004.sh b/ctdb/tests/tool/ctdb.natgw.004.sh index b4190058564..8e48dcf432f 100755 --- a/ctdb/tests/tool/ctdb.natgw.004.sh +++ b/ctdb/tests/tool/ctdb.natgw.004.sh @@ -10,23 +10,12 @@ setup_natgw <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x22 1 192.168.20.42 0x22 CURRENT RECMASTER 2 192.168.20.43 0x2 - -VNNMAP -654321 -0 -1 -2 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 2 192.168.20.43 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -46,9 +33,7 @@ required_result 0 <<EOF 192.168.20.43 MASTER EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -58,6 +43,4 @@ pnn:1 192.168.20.42 UNHEALTHY|STOPPED|INACTIVE (THIS NODE) pnn:2 192.168.20.43 UNHEALTHY EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.natgw.005.sh b/ctdb/tests/tool/ctdb.natgw.005.sh index 10fd4d47125..ccb05e8d8af 100755 --- a/ctdb/tests/tool/ctdb.natgw.005.sh +++ b/ctdb/tests/tool/ctdb.natgw.005.sh @@ -10,23 +10,12 @@ setup_natgw <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x20 1 192.168.20.42 0x20 CURRENT RECMASTER 2 192.168.20.43 0x20 - -VNNMAP -654321 -0 -1 -2 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 0 192.168.20.41 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -46,9 +33,7 @@ required_result 0 <<EOF 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -58,6 +43,4 @@ pnn:1 192.168.20.42 STOPPED|INACTIVE (THIS NODE) pnn:2 192.168.20.43 STOPPED|INACTIVE EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.natgw.006.sh b/ctdb/tests/tool/ctdb.natgw.006.sh index e120ece4d7e..0f194d81809 100755 --- a/ctdb/tests/tool/ctdb.natgw.006.sh +++ b/ctdb/tests/tool/ctdb.natgw.006.sh @@ -10,23 +10,12 @@ setup_natgw <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x20 1 192.168.20.42 0x20 CURRENT RECMASTER 2 192.168.20.43 0x20 - -VNNMAP -654321 -0 -1 -2 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 1 192.168.20.42 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -46,9 +33,7 @@ required_result 0 <<EOF 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -58,6 +43,4 @@ pnn:1 192.168.20.42 STOPPED|INACTIVE (THIS NODE) pnn:2 192.168.20.43 STOPPED|INACTIVE EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.natgw.007.sh b/ctdb/tests/tool/ctdb.natgw.007.sh index 9fac6bdfe83..9fdfc302f3b 100755 --- a/ctdb/tests/tool/ctdb.natgw.007.sh +++ b/ctdb/tests/tool/ctdb.natgw.007.sh @@ -10,32 +10,19 @@ setup_natgw <<EOF 192.168.20.43 slave-only EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x20 1 192.168.20.42 0x20 CURRENT RECMASTER 2 192.168.20.43 0x20 - -VNNMAP -654321 -0 -1 -2 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: -" +EOF ##### required_result 2 <<EOF EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -45,9 +32,7 @@ required_result 0 <<EOF 192.168.20.43 slave-only EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -57,6 +42,4 @@ pnn:1 192.168.20.42 STOPPED|INACTIVE (THIS NODE) pnn:2 192.168.20.43 STOPPED|INACTIVE EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.natgw.008.sh b/ctdb/tests/tool/ctdb.natgw.008.sh index 14e2c847939..db204a51383 100755 --- a/ctdb/tests/tool/ctdb.natgw.008.sh +++ b/ctdb/tests/tool/ctdb.natgw.008.sh @@ -10,23 +10,12 @@ setup_natgw <<EOF 192.168.20.43 EOF -ctdb_state="\ +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x1 1 192.168.20.42 0x0 CURRENT RECMASTER 2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -1 -2 - -IFACES -:Name:LinkStatus:References: -:eth2:1:2: -:eth1:1:4: -" +EOF ##### @@ -34,9 +23,7 @@ required_result 0 <<EOF 1 192.168.20.42 EOF -simple_test master <<EOF -$ctdb_state -EOF +simple_test master ##### @@ -46,9 +33,7 @@ required_result 0 <<EOF 192.168.20.43 EOF -simple_test list <<EOF -$ctdb_state -EOF +simple_test list ##### @@ -58,6 +43,4 @@ pnn:1 192.168.20.42 OK (THIS NODE) pnn:2 192.168.20.43 OK EOF -simple_test status <<EOF -$ctdb_state -EOF +simple_test status diff --git a/ctdb/tests/tool/ctdb.nodestatus.001.sh b/ctdb/tests/tool/ctdb.nodestatus.001.sh index 6392b8d1ecc..d97892e9639 100755 --- a/ctdb/tests/tool/ctdb.nodestatus.001.sh +++ b/ctdb/tests/tool/ctdb.nodestatus.001.sh @@ -4,14 +4,7 @@ define_test "all, 3 nodes, all OK" -required_result 0 <<EOF -Number of nodes:3 -pnn:0 192.168.20.41 OK -pnn:1 192.168.20.42 OK -pnn:2 192.168.20.43 OK (THIS NODE) -EOF - -simple_test all <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 1 192.168.20.42 0x0 @@ -21,10 +14,13 @@ IFACES :Name:LinkStatus:References: :eth2:1:2: :eth1:1:4: +EOF -VNNMAP -654321 -0 -1 -2 +required_result 0 <<EOF +Number of nodes:3 +pnn:0 192.168.20.41 OK +pnn:1 192.168.20.42 OK +pnn:2 192.168.20.43 OK (THIS NODE) EOF + +simple_test all diff --git a/ctdb/tests/tool/ctdb.nodestatus.002.sh b/ctdb/tests/tool/ctdb.nodestatus.002.sh index a3a7a42e434..3f8d6935dc2 100755 --- a/ctdb/tests/tool/ctdb.nodestatus.002.sh +++ b/ctdb/tests/tool/ctdb.nodestatus.002.sh @@ -4,14 +4,7 @@ define_test "all, 3 nodes, 1 disconnected" -required_result 1 <<EOF -Number of nodes:3 -pnn:0 192.168.20.41 OK -pnn:1 192.168.20.42 DISCONNECTED|INACTIVE -pnn:2 192.168.20.43 OK (THIS NODE) -EOF - -simple_test all <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 1 192.168.20.42 0x1 @@ -21,10 +14,13 @@ IFACES :Name:LinkStatus:References: :eth2:1:2: :eth1:1:4: +EOF -VNNMAP -654321 -0 -1 -2 +required_result 1 <<EOF +Number of nodes:3 +pnn:0 192.168.20.41 OK +pnn:1 192.168.20.42 DISCONNECTED|INACTIVE +pnn:2 192.168.20.43 OK (THIS NODE) EOF + +simple_test all diff --git a/ctdb/tests/tool/ctdb.recover.001.sh b/ctdb/tests/tool/ctdb.recover.001.sh index d1e8f50381d..15e05ca0cb5 100755 --- a/ctdb/tests/tool/ctdb.recover.001.sh +++ b/ctdb/tests/tool/ctdb.recover.001.sh @@ -4,9 +4,7 @@ define_test "Just a recovery" -ok_null - -simple_test <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT 1 192.168.20.42 0x0 RECMASTER @@ -18,3 +16,7 @@ VNNMAP 1 2 EOF + +ok_null + +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.001.sh b/ctdb/tests/tool/ctdb.reloadnodes.001.sh index 3d76b79c797..24cd94af76c 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.001.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.001.sh @@ -10,6 +10,13 @@ setup_nodes <<EOF 192.168.20.43 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x0 +2 192.168.20.43 0x0 +EOF + ok <<EOF Node 0 is unchanged Node 1 is unchanged @@ -17,15 +24,4 @@ Node 2 is unchanged No change in nodes file, skipping unnecessary reload EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x0 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -1 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.002.sh b/ctdb/tests/tool/ctdb.reloadnodes.002.sh index 61b14381f26..2e6252f1902 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.002.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.002.sh @@ -16,19 +16,15 @@ setup_nodes 1 <<EOF 192.168.20.43 EOF -required_result 255 <<EOF -ERROR: Node file on node 1 differs from current node (0) -EOF - -simple_test <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 +EOF -VNNMAP -654321 -0 -1 -2 +required_result 255 <<EOF +ERROR: Node file on node 1 differs from current node (0) EOF + +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.003.sh b/ctdb/tests/tool/ctdb.reloadnodes.003.sh index 7f3b7b2e250..5ba789299fa 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.003.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.003.sh @@ -18,21 +18,17 @@ EOF rm "$CTDB_NODES_1" -required_result 255 <<EOF -ctdb_control error: 'Failed to read nodes file' -ctdb_control error: 'Failed to read nodes file' -ERROR: Failed to get nodes file from node 1 -EOF - -simple_test <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x0 2 192.168.20.43 0x0 +EOF -VNNMAP -654321 -0 -1 -2 +required_result 255 <<EOF +ctdb_control error: 'Failed to read nodes file' +ctdb_control error: 'Failed to read nodes file' +ERROR: Failed to get nodes file from node 1 EOF + +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.011.sh b/ctdb/tests/tool/ctdb.reloadnodes.011.sh index 40ff939bbed..41a5566af91 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.011.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.011.sh @@ -11,6 +11,13 @@ setup_nodes <<EOF 192.168.20.44 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x0 +2 192.168.20.43 0x0 +EOF + required_result 0 <<EOF Node 0 is unchanged Node 1 is unchanged @@ -21,15 +28,4 @@ Reloading nodes file on node 1 Reloading nodes file on node 2 EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x0 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -1 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.012.sh b/ctdb/tests/tool/ctdb.reloadnodes.012.sh index 3640ea6d4db..4ebb6aed740 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.012.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.012.sh @@ -10,6 +10,13 @@ setup_nodes <<EOF #192.168.20.43 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x0 +2 192.168.20.43 0x1 +EOF + required_result 0 <<EOF Node 0 is unchanged Node 1 is unchanged @@ -18,14 +25,4 @@ Reloading nodes file on node 0 Reloading nodes file on node 1 EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x0 -2 192.168.20.43 0x1 - -VNNMAP -654321 -0 -1 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.013.sh b/ctdb/tests/tool/ctdb.reloadnodes.013.sh index 877608f6f3f..4156839a00b 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.013.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.013.sh @@ -10,6 +10,13 @@ setup_nodes <<EOF #192.168.20.43 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x0 +2 192.168.20.43 0x0 +EOF + required_result 1 <<EOF Node 0 is unchanged Node 1 is unchanged @@ -18,15 +25,4 @@ ERROR: Node 2 is still connected ERROR: Nodes will not be reloaded due to previous error EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x0 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -1 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.014.sh b/ctdb/tests/tool/ctdb.reloadnodes.014.sh index df46f0f961d..1a005a164bc 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.014.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.014.sh @@ -10,6 +10,13 @@ setup_nodes <<EOF 192.168.20.43 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x1 +1 192.168.20.42 0x0 +2 192.168.20.43 0x0 CURRENT RECMASTER +EOF + required_result 0 <<EOF Node 0 is DELETED Node 1 is unchanged @@ -18,14 +25,4 @@ Reloading nodes file on node 1 Reloading nodes file on node 2 EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x1 -1 192.168.20.42 0x0 -2 192.168.20.43 0x0 CURRENT RECMASTER - -VNNMAP -654321 -1 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.015.sh b/ctdb/tests/tool/ctdb.reloadnodes.015.sh index 1bd58fe5e6d..14c3c314668 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.015.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.015.sh @@ -10,6 +10,13 @@ setup_nodes <<EOF 192.168.20.43 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 +1 192.168.20.42 0x0 +2 192.168.20.43 0x0 CURRENT RECMASTER +EOF + required_result 1 <<EOF Node 0 is DELETED ERROR: Node 0 is still connected @@ -18,15 +25,4 @@ Node 2 is unchanged ERROR: Nodes will not be reloaded due to previous error EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 -1 192.168.20.42 0x0 -2 192.168.20.43 0x0 CURRENT RECMASTER - -VNNMAP -654321 -0 -1 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.016.sh b/ctdb/tests/tool/ctdb.reloadnodes.016.sh index d79159a0f4f..a239a7cf151 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.016.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.016.sh @@ -10,6 +10,13 @@ setup_nodes <<EOF 192.168.20.43 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x1 +2 192.168.20.43 0x0 +EOF + required_result 0 <<EOF Node 0 is unchanged Node 1 is DELETED @@ -18,14 +25,4 @@ Reloading nodes file on node 0 Reloading nodes file on node 2 EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x1 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.017.sh b/ctdb/tests/tool/ctdb.reloadnodes.017.sh index 3158aede9d2..e5f20301357 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.017.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.017.sh @@ -10,6 +10,13 @@ setup_nodes <<EOF 192.168.20.43 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x0 +2 192.168.20.43 0x0 +EOF + required_result 1 <<EOF Node 0 is unchanged Node 1 is DELETED @@ -18,15 +25,4 @@ Node 2 is unchanged ERROR: Nodes will not be reloaded due to previous error EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x0 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -1 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.018.sh b/ctdb/tests/tool/ctdb.reloadnodes.018.sh index 6075fcef107..5f994d1fb3a 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.018.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.018.sh @@ -13,6 +13,13 @@ setup_nodes <<EOF 192.168.20.46 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x0 +2 192.168.20.43 0x0 +EOF + required_result 0 <<EOF Node 0 is unchanged Node 1 is unchanged @@ -25,15 +32,4 @@ Reloading nodes file on node 1 Reloading nodes file on node 2 EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x0 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -1 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.019.sh b/ctdb/tests/tool/ctdb.reloadnodes.019.sh index 7bea81af2cc..c40ae52fad0 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.019.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.019.sh @@ -12,6 +12,13 @@ setup_nodes <<EOF 192.168.20.45 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x1 +2 192.168.20.43 0x0 +EOF + required_result 0 <<EOF Node 0 is unchanged Node 1 is DELETED @@ -22,14 +29,4 @@ Reloading nodes file on node 0 Reloading nodes file on node 2 EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x1 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.020.sh b/ctdb/tests/tool/ctdb.reloadnodes.020.sh index 6e7826c048c..da197a5ad52 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.020.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.020.sh @@ -12,6 +12,13 @@ setup_nodes <<EOF 192.168.20.45 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x0 +2 192.168.20.43 0x1 +EOF + required_result 0 <<EOF Node 0 is unchanged Node 1 is unchanged @@ -22,14 +29,4 @@ Reloading nodes file on node 0 Reloading nodes file on node 1 EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x0 -2 192.168.20.43 0x1 - -VNNMAP -654321 -0 -1 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.021.sh b/ctdb/tests/tool/ctdb.reloadnodes.021.sh index aaf4e1492e3..8ec51e85b5a 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.021.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.021.sh @@ -11,6 +11,13 @@ setup_nodes <<EOF 192.168.20.44 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x1 +2 192.168.20.43 0x0 +EOF + required_result 0 <<EOF Node 0 is unchanged Node 1 is unchanged @@ -21,14 +28,4 @@ Reloading nodes file on node 0 Reloading nodes file on node 2 EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x1 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.022.sh b/ctdb/tests/tool/ctdb.reloadnodes.022.sh index c2a89c049a6..1b1f588b614 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.022.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.022.sh @@ -14,16 +14,13 @@ setup_nodes <<EOF 192.168.20.45 EOF -ok_null - -simple_test <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x1 2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -2 EOF + +ok_null + +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.023.sh b/ctdb/tests/tool/ctdb.reloadnodes.023.sh index bc768c27cae..931ba38c794 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.023.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.023.sh @@ -10,6 +10,13 @@ setup_nodes <<EOF 192.168.20.43 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x11 +2 192.168.20.43 0x0 +EOF + ok <<EOF Node 0 is unchanged Node 1 is UNDELETED @@ -18,14 +25,4 @@ Reloading nodes file on node 0 Reloading nodes file on node 2 EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x11 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.reloadnodes.024.sh b/ctdb/tests/tool/ctdb.reloadnodes.024.sh index 2d2d2201d3c..cf6cd9bbc86 100755 --- a/ctdb/tests/tool/ctdb.reloadnodes.024.sh +++ b/ctdb/tests/tool/ctdb.reloadnodes.024.sh @@ -10,6 +10,13 @@ setup_nodes <<EOF 192.168.20.43 EOF +setup_ctdbd <<EOF +NODEMAP +0 192.168.20.41 0x0 CURRENT RECMASTER +1 192.168.20.42 0x11 +2 192.168.20.43 0x0 +EOF + ok <<EOF Node 0 is unchanged Node 1 is unchanged (DELETED) @@ -17,14 +24,4 @@ Node 2 is unchanged No change in nodes file, skipping unnecessary reload EOF -simple_test <<EOF -NODEMAP -0 192.168.20.41 0x0 CURRENT RECMASTER -1 192.168.20.42 0x11 -2 192.168.20.43 0x0 - -VNNMAP -654321 -0 -2 -EOF +simple_test diff --git a/ctdb/tests/tool/ctdb.status.001.sh b/ctdb/tests/tool/ctdb.status.001.sh index 48b5bac24a9..28f93eaa33e 100755 --- a/ctdb/tests/tool/ctdb.status.001.sh +++ b/ctdb/tests/tool/ctdb.status.001.sh @@ -4,21 +4,7 @@ define_test "all, 3 nodes, all ok" -required_result 0 <<EOF -Number of nodes:3 -pnn:0 192.168.20.41 OK (THIS NODE) -pnn:1 192.168.20.42 OK -pnn:2 192.168.20.43 OK -Generation:654321 -Size:3 -hash:0 lmaster:0 -hash:1 lmaster:1 -hash:2 lmaster:2 -Recovery mode:NORMAL (0) -Recovery master:0 -EOF - -simple_test all <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x0 CURRENT RECMASTER 1 192.168.20.42 0x0 @@ -35,3 +21,19 @@ VNNMAP 1 2 EOF + +required_result 0 <<EOF +Number of nodes:3 +pnn:0 192.168.20.41 OK (THIS NODE) +pnn:1 192.168.20.42 OK +pnn:2 192.168.20.43 OK +Generation:654321 +Size:3 +hash:0 lmaster:0 +hash:1 lmaster:1 +hash:2 lmaster:2 +Recovery mode:NORMAL (0) +Recovery master:0 +EOF + +simple_test all diff --git a/ctdb/tests/tool/ctdb.status.002.sh b/ctdb/tests/tool/ctdb.status.002.sh index fceceb30e0d..233847170df 100755 --- a/ctdb/tests/tool/ctdb.status.002.sh +++ b/ctdb/tests/tool/ctdb.status.002.sh @@ -4,21 +4,7 @@ define_test "all, 3 nodes, 1 unhealthy" -required_result 0 <<EOF -Number of nodes:3 -pnn:0 192.168.20.41 UNHEALTHY -pnn:1 192.168.20.42 OK (THIS NODE) -pnn:2 192.168.20.43 OK -Generation:654321 -Size:3 -hash:0 lmaster:0 -hash:1 lmaster:1 -hash:2 lmaster:2 -Recovery mode:NORMAL (0) -Recovery master:1 -EOF - -simple_test <<EOF +setup_ctdbd <<EOF NODEMAP 0 192.168.20.41 0x2 1 192.168.20.42 0x0 CURRENT RECMASTER @@ -35,3 +21,19 @@ IFACES :eth2:1:2: :eth1:1:4: EOF + +required_result 0 <<EOF +Number of nodes:3 +pnn:0 192.168.20.41 UNHEALTHY +pnn:1 192.168.20.42 OK (THIS NODE) +pnn:2 192.168.20.43 OK +Generation:654321 +Size:3 +hash:0 lmaster:0 +hash:1 lmaster:1 +hash:2 lmaster:2 +Recovery mode:NORMAL (0) +Recovery master:1 +EOF + +simple_test diff --git a/ctdb/tests/tool/scripts/local.sh b/ctdb/tests/tool/scripts/local.sh index 3033c73a68b..4118102e9fb 100644 --- a/ctdb/tests/tool/scripts/local.sh +++ b/ctdb/tests/tool/scripts/local.sh @@ -46,8 +46,8 @@ setup_ctdbd () { debug "Setting up fake ctdbd" - cat | fake_ctdbd -s "$ctdbd_socket" -p "$ctdbd_pidfile" - #test_cleanup cleanup_ctdbd + fake_ctdbd -s "$ctdbd_socket" -p "$ctdbd_pidfile" + test_cleanup cleanup_ctdbd } setup_natgw () @@ -124,9 +124,7 @@ setup_nodes () simple_test () { - setup_ctdbd (unit_test $CTDB -d $CTDB_DEBUGLEVEL $test_args "$@") status=$? - cleanup_ctdbd [ $status -eq 0 ] || exit $status } |