diff options
Diffstat (limited to 'ctdb/tests/complex')
-rwxr-xr-x | ctdb/tests/complex/31_nfs_tickle.sh | 8 | ||||
-rwxr-xr-x | ctdb/tests/complex/32_cifs_tickle.sh | 2 | ||||
-rwxr-xr-x | ctdb/tests/complex/42_failover_ssh_hostname.sh | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/ctdb/tests/complex/31_nfs_tickle.sh b/ctdb/tests/complex/31_nfs_tickle.sh index 219fc0e5ed8..45734cc7cdb 100755 --- a/ctdb/tests/complex/31_nfs_tickle.sh +++ b/ctdb/tests/complex/31_nfs_tickle.sh @@ -74,16 +74,10 @@ echo "Source socket is $src_socket" echo "Sleeping for MonitorInterval..." sleep_for $monitor_interval -echo "Trying to determine NFS_TICKLE_SHARED_DIRECTORY..." -f="/etc/sysconfig/nfs" -try_command_on_node -v 0 "[ -r $f ] && sed -n -e s@^NFS_TICKLE_SHARED_DIRECTORY=@@p $f" || true - -nfs_tickle_shared_directory="${out:-/gpfs/.ctdb/nfs-tickles}" - try_command_on_node $test_node hostname test_hostname=$out -try_command_on_node -v 0 cat "${nfs_tickle_shared_directory}/$test_hostname/$test_ip" +try_command_on_node -v 0 cat /gpfs/.ctdb/nfs-tickles/$test_hostname/$test_ip if [ "${out/${src_socket}/}" != "$out" ] ; then echo "GOOD: NFS connection tracked OK in tickles file." diff --git a/ctdb/tests/complex/32_cifs_tickle.sh b/ctdb/tests/complex/32_cifs_tickle.sh index 4ce74f9ad1f..94b28617d9a 100755 --- a/ctdb/tests/complex/32_cifs_tickle.sh +++ b/ctdb/tests/complex/32_cifs_tickle.sh @@ -74,7 +74,7 @@ echo "Source socket is $src_socket" # CTDB faster than it takes us to wait for netstat to register the # connection and then use onnode below to ask CTDB about it. -try_command_on_node -v 0 ctdb gettickles $test_ip -n $test_node +try_command_on_node -v 0 ctdb gettickles $test_ip if [ "${out/SRC: ${src_socket} /}" != "$out" ] ; then echo "GOOD: CIFS connection tracked OK by CTDB." diff --git a/ctdb/tests/complex/42_failover_ssh_hostname.sh b/ctdb/tests/complex/42_failover_ssh_hostname.sh index 4b3ed882237..19652487896 100755 --- a/ctdb/tests/complex/42_failover_ssh_hostname.sh +++ b/ctdb/tests/complex/42_failover_ssh_hostname.sh @@ -51,7 +51,7 @@ echo "Removing ${test_ip} from the local ARP table..." arp -d $test_ip >/dev/null 2>&1 || true echo "SSHing to ${test_ip} and running hostname..." -original_hostname=$(ssh -o "StrictHostKeyChecking no" $test_ip hostname) +original_hostname=$(ssh $test_ip hostname) [ $? -eq 0 ] echo "Hostname is: ${original_hostname}" @@ -65,7 +65,7 @@ onnode 0 $CTDB_TEST_WRAPPER wait_until_node_has_status $test_node disabled gratarp_sniff_wait_show echo "SSHing to ${test_ip} and running hostname (again)..." -new_hostname=$(ssh -o "StrictHostKeyChecking no" $test_ip hostname) +new_hostname=$(ssh $test_ip hostname) [ $? -eq 0 ] echo "Hostname is: ${new_hostname}" |