diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-12-03 15:57:35 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-12-05 21:02:40 +0100 |
| commit | 62164ec52fd1082863bf5017a5170f74f18a07c3 (patch) | |
| tree | 8af5fc81a8f5decc3cade290d4448b9dad91a37c /ctdb/tests | |
| parent | d9d07fff34143d251b4987cdb1cff1e8b3384e64 (diff) | |
| download | samba-62164ec52fd1082863bf5017a5170f74f18a07c3.tar.gz samba-62164ec52fd1082863bf5017a5170f74f18a07c3.tar.xz samba-62164ec52fd1082863bf5017a5170f74f18a07c3.zip | |
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>
Diffstat (limited to 'ctdb/tests')
| -rwxr-xr-x | ctdb/tests/complex/44_failover_nfs_oneway.sh | 2 | ||||
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/tests/complex/44_failover_nfs_oneway.sh b/ctdb/tests/complex/44_failover_nfs_oneway.sh index aaec2ed990..1bc09f55f4 100755 --- 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 b75e8f95fe..2ae03425f4 100644 --- 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 () |