summaryrefslogtreecommitdiffstats
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-11-26 21:31:42 +1100
committerMartin Schwenke <martins@samba.org>2014-12-05 21:02:40 +0100
commit2a83b74597a3366536e1935e2e8ff23493503117 (patch)
tree8b22e2361fd047a0a84fccc9edf7a1c37a305678 /ctdb
parent2d480792e7d0b3f6628186dc77f54b708e315dd1 (diff)
downloadsamba-2a83b74597a3366536e1935e2e8ff23493503117.tar.gz
samba-2a83b74597a3366536e1935e2e8ff23493503117.tar.xz
samba-2a83b74597a3366536e1935e2e8ff23493503117.zip
ctdb-tests: Extend regexp to match IPv6 addresses
Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
-rwxr-xr-xctdb/tests/simple/05_ctdb_listnodes.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/ctdb/tests/simple/05_ctdb_listnodes.sh b/ctdb/tests/simple/05_ctdb_listnodes.sh
index a84e4af980..9e48a68e3c 100755
--- a/ctdb/tests/simple/05_ctdb_listnodes.sh
+++ b/ctdb/tests/simple/05_ctdb_listnodes.sh
@@ -35,9 +35,11 @@ try_command_on_node -v 0 "$CTDB listnodes"
num_nodes=$(echo "$out" | wc -l)
# Each line should look like an IP address.
+ipv4_pat='[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'
+ipv6_pat='[[:xdigit:]]+:[[:xdigit:]:]+[[:xdigit:]]+'
sanity_check_output \
2 \
- '^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$' \
+ "^${ipv4_pat}|${ipv6_pat}\$" \
"$out"
out_0="$out"