sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

ctdb-tests: Adjust unit test output matching new ctdb

Browse Source 
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2016-07-26 13:55:41 +10:00 committed by Stefan Metzmacher
parent 70f2573f2a
commit 29b7825dcf
8 changed files with 30 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ctdb/tests/tool/ctdb.getcapabilities.003.sh
View File

@ -18,11 +18,10 @@ NODEMAP
EOF
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?
connect() failed, errno=2
Failed to connect to CTDB daemon ($ctdbd_socket)
Failed to detect PNN of the current node.
Is this node part of CTDB cluster?
EOF
simple_test

8
ctdb/tests/tool/ctdb.getvar.002.sh
View File

@ -11,13 +11,7 @@ NODEMAP
2 192.168.20.43 0x0
EOF
result_filter ()
{
sed -e 's|^[^:]*:[0-9][0-9]* |FILE:LINE |'
}
required_result 1 <<EOF
FILE:LINE ctdb_control for get_tunable failed
Unable to get tunable variable 'TheQuickBrownFoxJumpsOverTheLazyDog'
No such tunable TheQuickBrownFoxJumpsOverTheLazyDog
EOF
simple_test "TheQuickBrownFoxJumpsOverTheLazyDog"

44
ctdb/tests/tool/ctdb.lvs.008.sh
View File

@ -22,48 +22,44 @@ EOF
#####
required_result 10 <<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?
required_result 1 <<EOF
connect() failed, errno=2
Failed to connect to CTDB daemon ($ctdbd_socket)
Failed to detect PNN of the current node.
Is this node part of CTDB cluster?
EOF
simple_test list
#####
required_result 10 <<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?
required_result 1 <<EOF
connect() failed, errno=2
Failed to connect to CTDB daemon ($ctdbd_socket)
Failed to detect PNN of the current node.
Is this node part of CTDB cluster?
EOF
simple_test master
#####
required_result 10 <<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?
required_result 1 <<EOF
connect() failed, errno=2
Failed to connect to CTDB daemon ($ctdbd_socket)
Failed to detect PNN of the current node.
Is this node part of CTDB cluster?
EOF
simple_test list
#####
required_result 10 <<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?
required_result 1 <<EOF
connect() failed, errno=2
Failed to connect to CTDB daemon ($ctdbd_socket)
Failed to detect PNN of the current node.
Is this node part of CTDB cluster?
EOF
simple_test status

3
ctdb/tests/tool/ctdb.reloadnodes.003.sh
View File

@ -26,8 +26,7 @@ NODEMAP
EOF
required_result 1 <<EOF
ctdb_control error: 'Failed to read nodes file'
ctdb_control error: 'Failed to read nodes file'
Control GET_NODES_FILE failed, ret=-1
ERROR: Failed to get nodes file from node 1
EOF

9
ctdb/tests/tool/ctdb.setdbreadonly.003.sh
View File

@ -18,15 +18,8 @@ DBMAP
0x6cf2837d registry.tdb PERSISTENT 42
EOF
result_filter ()
{
sed -e 's|^[^:]*:[0-9][0-9]* |FILE:LINE |'
}
required_result 1 <<EOF
ctdb_control error: 'Can not set READONLY on persistent db'
FILE:LINE ctdb_ctrl_set_db_readonly_recv failed ret:22 res:-1
Unable to set db to support readonly
Cannot set READONLY on persistent DB
EOF
simple_test secrets.tdb

9
ctdb/tests/tool/ctdb.setdbsticky.003.sh
View File

@ -18,15 +18,8 @@ DBMAP
0x6cf2837d registry.tdb PERSISTENT 42
EOF
result_filter ()
{
sed -e 's|^[^:]*:[0-9][0-9]* |FILE:LINE |'
}
required_result 1 <<EOF
ctdb_control error: 'Can not set STICKY on persistent db'
FILE:LINE ctdb_ctrl_set_db_sticky_recv failed ret:22 res:-1
Unable to set db to support sticky records
Cannot set STICKY on persistent DB
EOF
simple_test secrets.tdb

9
ctdb/tests/tool/ctdb.setifacelink.002.sh
View File

@ -16,14 +16,7 @@ IFACES
:eth1:0:4:
EOF
result_filter ()
{
sed -e 's|^[^:]*:[0-9][0-9]* |FILE:LINE |'
}
required_result 1 <<EOF
ctdb_control error: 'interface not found'
FILE:LINE ctdb_control for set iface link failed ret:-1 res:-1
Unable to set link state for interfaces eth0 node 0
Interface eth0 not configured on node 0
EOF
simple_test eth0 down

8
ctdb/tests/tool/ctdb.setvar.002.sh
View File

@ -11,13 +11,7 @@ NODEMAP
2 192.168.20.43 0x0
EOF
result_filter ()
{
sed -e 's|^[^:]*:[0-9][0-9]* |FILE:LINE |'
}
required_result 1 <<EOF
FILE:LINE ctdb_control for set_tunable failed
Unable to set tunable variable 'TheQuickBrownFoxJumpsOverTheLazyDog'
No such tunable TheQuickBrownFoxJumpsOverTheLazyDog
EOF
simple_test "TheQuickBrownFoxJumpsOverTheLazyDog" 42