Test suite: A timeout of MonitorInterval seconds sometimes isn't enough.

Monitor events sometimes happen a little bit more than MonitorInterval
seconds apart.  This changes some timeouts to MonitorInterval + 1
seconds.

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

diff --git a/tests/complex/01_ctdb_nfs_skip_share_check.sh b/tests/complex/01_ctdb_nfs_skip_share_check.sh
index c69c8cadbb86d32add1379ddc8b2af0747129b9a..6440932c308e97b6ece6e9b550a8a62755175d1f 100755 (executable)
--- a/tests/complex/01_ctdb_nfs_skip_share_check.sh
+++ b/tests/complex/01_ctdb_nfs_skip_share_check.sh
@@ -69,7 +69,7 @@ select_test_node_and_ips
 
 # We need this for later, so we know how long to sleep.
 try_command_on_node $test_node $CTDB getvar MonitorInterval
-monitor_interval="${out#*= }"
+monitor_interval=$((${out#*= } + 1))
 
 mydir=$(onnode -q $test_node mktemp -d)
 rc_local_d="${CTDB_BASE:-/etc/ctdb}/rc.local.d"

diff --git a/tests/complex/02_ctdb_samba_skip_share_check.sh b/tests/complex/02_ctdb_samba_skip_share_check.sh
index 9152f7edc24d698fb53537bf431f45dc27747a2d..2cbd76b76703f0dc927ec2da632f7103f1421e67 100755 (executable)
--- a/tests/complex/02_ctdb_samba_skip_share_check.sh
+++ b/tests/complex/02_ctdb_samba_skip_share_check.sh
@@ -69,7 +69,7 @@ select_test_node_and_ips
 
 # We need this for later, so we know how long to sleep.
 try_command_on_node $test_node $CTDB getvar MonitorInterval
-monitor_interval="${out#*= }"
+monitor_interval=$((${out#*= } + 1))
 
 mydir=$(onnode -q $test_node mktemp -d)
 rc_local_d="${CTDB_BASE:-/etc/ctdb}/rc.local.d"