Test suite: handle extra lines in statistics output.
authorMartin Schwenke <martin@meltin.net>
Mon, 7 Jun 2010 02:03:25 +0000 (12:03 +1000)
committerMartin Schwenke <martin@meltin.net>
Mon, 26 Jul 2010 05:28:59 +0000 (15:28 +1000)
Signed-off-by: Martin Schwenke <martin@meltin.net>
tests/simple/14_ctdb_statistics.sh

index 58c76be33a9b4be68bb03f717141c67473d65933..9a95a83b277ae34b397140c163b994b4017c9df5 100755 (executable)
@@ -33,7 +33,7 @@ set -e
 
 cluster_is_healthy
 
-pattern='^(CTDB version 1|Gathered statistics for [[:digit:]]+ nodes|[[:space:]]+[[:alpha:]_]+[[:space:]]+[[:digit:]]+|[[:space:]]+(node|client|timeouts)|[[:space:]]+([[:alpha:]_]+_latency|max_reclock_[[:alpha:]]+)[[:space:]]+[[:digit:]-]+\.[[:digit:]]+[[:space:]]sec)$'
+pattern='^(CTDB version 1|Current time of statistics[[:space:]]*:.*|Statistics collected since[[:space:]]*:.*|Gathered statistics for [[:digit:]]+ nodes|[[:space:]]+[[:alpha:]_]+[[:space:]]+[[:digit:]]+|[[:space:]]+(node|client|timeouts)|[[:space:]]+([[:alpha:]_]+_latency|max_reclock_[[:alpha:]]+)[[:space:]]+[[:digit:]-]+\.[[:digit:]]+[[:space:]]sec)$'
 
 try_command_on_node -v 1 "$CTDB statistics"