[SCM] CTDB repository - branch master updated - ctdb-1.0.105-1-gc4b05a7

Ronnie Sahlberg sahlberg at samba.org
Wed Nov 18 20:57:32 MST 2009


The branch, master has been updated
       via  c4b05a731e1bee8f5b46529773a4f5389b2b6064 (commit)
      from  5fdf842db09cd806248cdbdce2270f39ed213872 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c4b05a731e1bee8f5b46529773a4f5389b2b6064
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Nov 19 14:54:05 2009 +1100

    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 at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 tests/complex/32_cifs_tickle.sh |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/complex/32_cifs_tickle.sh b/tests/complex/32_cifs_tickle.sh
index 6f7d95b..3a77381 100755
--- a/tests/complex/32_cifs_tickle.sh
+++ b/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."


-- 
CTDB repository


More information about the samba-cvs mailing list