diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-03-15 16:09:41 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-03-15 16:09:41 +1100 |
| commit | b3ddf6901d1f4706731771606f466da4c6165fd9 (patch) | |
| tree | 3f401e8292705aba9273638ad97dd6b86e3a2ea2 /ctdb/tests/simple | |
| parent | f7b2adfde6e2fc225bcb9271dde5d73cfab656bf (diff) | |
| parent | 88c74987dc90fa09bb8501f20a509c12480fba2e (diff) | |
| download | samba-b3ddf6901d1f4706731771606f466da4c6165fd9.tar.gz | |
Merge remote branch 'martins/master'
(This used to be ctdb commit af72f8bc05f78983f9624d81788f9d89af474b11)
Diffstat (limited to 'ctdb/tests/simple')
| -rwxr-xr-x | ctdb/tests/simple/09_ctdb_ping.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/tests/simple/09_ctdb_ping.sh b/ctdb/tests/simple/09_ctdb_ping.sh index 401e48dcf34..50612a2512e 100755 --- a/ctdb/tests/simple/09_ctdb_ping.sh +++ b/ctdb/tests/simple/09_ctdb_ping.sh @@ -53,5 +53,5 @@ try_command_on_node -v 0 "! $CTDB ping -n 1" sanity_check_output \ 1 \ - "(: ctdb_control error: ('ctdb_control to disconnected node'|'node is disconnected')|Unable to get ping response from node 1|Node 1 is DISCONNECTED|ctdb_control for getpnn failed|: Can not access node. Node is not operational\.)" \ + "(: ctdb_control error: ('ctdb_control to disconnected node'|'node is disconnected')|Unable to get ping response from node 1|Node 1 is DISCONNECTED|ctdb_control for getpnn failed|: Can not access node. Node is not operational\.|Node 1 has status DISCONNECTED\|UNHEALTHY\|INACTIVE$)" \ "$out" diff --git a/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh b/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh index cddc21c6b00..78541d6e69d 100755 --- a/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh +++ b/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh @@ -54,15 +54,15 @@ try_command_on_node $test_node $CTDB shutdown wait_until_node_has_status $test_node disconnected 30 0 -pat="ctdb_control error: 'ctdb_control to disconnected node'|ctdb_control error: 'node is disconnected'|Node $test_node is DISCONNECTED" +pat="ctdb_control error: 'ctdb_control to disconnected node'|ctdb_control error: 'node is disconnected'|Node $test_node is DISCONNECTED|Node $test_node has status DISCONNECTED\|UNHEALTHY\|INACTIVE" for i in ip disable enable "ban 0" unban listvars ; do try_command_on_node -v 0 ! $CTDB $i -n $test_node if egrep -q "$pat" <<<"$out" ; then - echo "OK: \"ctdb ${i}\" fails with \"disconnected node\"" + echo "OK: \"ctdb ${i}\" fails with expected \"disconnected node\" message" else - echo "BAD: \"ctdb ${i}\" does not fail with \"disconnected node\"" + echo "BAD: \"ctdb ${i}\" does not fail with expected \"disconnected node\" message" exit 1 fi done |