diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-12-03 15:58:20 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-12-05 21:02:40 +0100 |
| commit | 62acf5986f52a3118ed4e3638c5ac8b1f9c0adf8 (patch) | |
| tree | bf84854193454add9fbeb6feb56cc4041b4e9722 | |
| parent | 62164ec52fd1082863bf5017a5170f74f18a07c3 (diff) | |
| download | samba-62acf5986f52a3118ed4e3638c5ac8b1f9c0adf8.tar.gz samba-62acf5986f52a3118ed4e3638c5ac8b1f9c0adf8.tar.xz samba-62acf5986f52a3118ed4e3638c5ac8b1f9c0adf8.zip | |
ctdb-tests: Extend regexps to handle IPv6 address matching
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
| -rwxr-xr-x | ctdb/tests/complex/11_ctdb_delip_removes_ip.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh b/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh index d67cb070c8..d023e98da8 100755 --- a/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh +++ b/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh @@ -26,7 +26,7 @@ select_test_node_and_ips get_test_ip_mask_and_iface echo "Checking that node ${test_node} hosts ${test_ip} on interface ${iface}..." -try_command_on_node $test_node "ip addr show dev $iface | grep -E 'inet[[:space:]]*${test_ip}/'" +try_command_on_node $test_node "ip addr show dev $iface | grep -E 'inet6?[[:space:]]*${test_ip}/'" echo "Attempting to remove ${test_ip} from node ${test_node}." try_command_on_node $test_node $CTDB delip $test_ip @@ -38,7 +38,7 @@ count=0 echo "Waiting for ${test_ip} to disappear from ${iface}..." while : ; do try_command_on_node -v $test_node "ip addr show dev $iface" - if echo "$out" | grep -E 'inet[[:space:]]*${test_ip}/'; then + if echo "$out" | grep -E 'inet6?[[:space:]]*${test_ip}/'; then echo "Still there..." if [ $(($count * $increment)) -ge $timeout ] ; then echo "BAD: Timed out waiting..." |