diff options
| author | Martin Schwenke <martin@meltin.net> | 2009-11-19 14:54:05 +1100 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2009-11-19 14:54:05 +1100 |
| commit | 4ea6069de477feb949543a6bc8e04bca061c180b (patch) | |
| tree | 239f9dc7c00962fdfd3ffb93425c8e562f3342ed /ctdb/tests | |
| parent | 894a2f9c0b9fc3c954d9fc3745da4d58f2217579 (diff) | |
| download | samba-4ea6069de477feb949543a6bc8e04bca061c180b.tar.gz samba-4ea6069de477feb949543a6bc8e04bca061c180b.tar.xz samba-4ea6069de477feb949543a6bc8e04bca061c180b.zip | |
Test suite: Make the CIFS tickle test wait until it sees the required tickle.
The test depended on the exit code of "ctdb gettickles", which always
succeeds. This change wraps the command in a function that checks
whether the tickle we're interested in is registered.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit c4b05a731e1bee8f5b46529773a4f5389b2b6064)
Diffstat (limited to 'ctdb/tests')
| -rwxr-xr-x | ctdb/tests/complex/32_cifs_tickle.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ctdb/tests/complex/32_cifs_tickle.sh b/ctdb/tests/complex/32_cifs_tickle.sh index 6f7d95b7572..3a773819607 100755 --- a/ctdb/tests/complex/32_cifs_tickle.sh +++ b/ctdb/tests/complex/32_cifs_tickle.sh @@ -72,8 +72,16 @@ echo "Source socket is $src_socket" # This should happen as soon as connection is up... but unless we wait # we sometimes beat the registration. +check_tickles () +{ + try_command_on_node 0 ctdb gettickles $test_ip -n $test_node + # SRC: 10.0.2.45:49091 DST: 10.0.2.143:445 + [ "${out/SRC: ${src_socket} /}" != "$out" ] +} + echo "Checking if CIFS connection is tracked by CTDB..." -wait_until 10 try_command_on_node 0 ctdb gettickles $test_ip -n $test_node +wait_until 10 check_tickles +echo "$out" if [ "${out/SRC: ${src_socket} /}" != "$out" ] ; then echo "GOOD: CIFS connection tracked OK by CTDB." |