ctdb-tests: Bracket IP addresses in NFS mounts and scp command (for IPv6)

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/complex/44_failover_nfs_oneway.sh b/ctdb/tests/complex/44_failover_nfs_oneway.sh
index aaec2ed9905992d2b8a41ce6b30f8cef62f968ca..1bc09f55f49ac8c5c0544d31d98e0f5c8cfca22f 100755 (executable)
--- a/ctdb/tests/complex/44_failover_nfs_oneway.sh
+++ b/ctdb/tests/complex/44_failover_nfs_oneway.sh
@@ -59,7 +59,7 @@ ctdb_test_exit_hook_add rm -f "$local_f"
 dd if=/dev/urandom of=$local_f bs=1k count=1
 local_sum=$(sum $local_f)
 
-scp -p "$local_f" "${test_ip}:${nfs_remote_file}"
+scp -p "$local_f" "[${test_ip}]:${nfs_remote_file}"
 try_command_on_node $test_node "chmod 644 $nfs_remote_file"
 
 nfs_sum=$(sum $nfs_local_file)

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index b75e8f95feb5778818a71e73374230ad4a70fd9f..2ae03425f43514d430ab59cee51806d3f4cfd27a 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -669,7 +669,7 @@ nfs_test_setup ()
 
     echo "Mounting ${test_ip}:${nfs_first_export} on ${nfs_mnt_d} ..."
     mount -o timeo=1,hard,intr,vers=3 \
-       ${test_ip}:${nfs_first_export} ${nfs_mnt_d}
+       "[${test_ip}]:${nfs_first_export}" ${nfs_mnt_d}
 }
 
 nfs_test_cleanup ()