sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

ctdb_test_env now sets $CTDB_TIMEOUT. Fixed

Browse Source 
26_ctdb_config_check_error_on_unreachable_ctdb.sh to work with new
generic error message when trying to talk to disconnected node.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 33afe9bae732e62994e5957ee143a9c49571898b)
This commit is contained in:
Martin Schwenke 2008-12-17 16:59:23 +11:00
parent 9e3ccd9d69
commit 12c16dd9b0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tests/scripts/ctdb_test_env
View File

@ -11,6 +11,8 @@ ctdb_test_scripts_dir=$(cd $(dirname $0) ; pwd)
PATH="${ctdb_test_scripts_dir}:${ctdb_tools_dir}:${PATH}"
export CTDB_TIMEOUT=60
######################################################################
if [ -n "$CTDB_TEST_REMOTE_SCRIPTS_DIR" ] ; then

4
ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh
View File

@ -57,7 +57,9 @@ msg="ctdb_control error: 'ctdb_control to disconnected node'"
for i in ip disable enable "ban 0" unban listvars ; do
try_command_on_node -v 0 ! ctdb $i -n $test_node
if [ "${out/${msg}}" != "$out" ] ; then
pat="ctdb_control error: 'ctdb_control to disconnected node'|Node $test_node is DISCONNECTED"
if egrep -q "$pat" <<<"$out" ; then
echo "OK: \"ctdb ${i}\" fails with \"disconnected node\""
else
echo "BAD: \"ctdb ${i}\" does not fail with \"disconnected node\""