summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2010-10-15 15:09:08 +1100
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2010-11-17 11:35:05 +1100
commitbcb6e726b60f81eb874cc5adf043f8fc6222f1f5 (patch)
treef71fc4ad4d7bb15d433fe083f79a186f34cd3659
parent714901e103f25658ae3b52c86b7b7a118d89ee79 (diff)
downloadsamba-bcb6e726b60f81eb874cc5adf043f8fc6222f1f5.tar.gz
samba-bcb6e726b60f81eb874cc5adf043f8fc6222f1f5.tar.xz
samba-bcb6e726b60f81eb874cc5adf043f8fc6222f1f5.zip
Test suite: make statistics test cope with changes to statistics output.
Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit 9e88466a99b5245d5f0ebab553be8d2b9b9a58e2)
-rwxr-xr-xctdb/tests/simple/14_ctdb_statistics.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/tests/simple/14_ctdb_statistics.sh b/ctdb/tests/simple/14_ctdb_statistics.sh
index 9a95a83b27..e9ecce5892 100755
--- a/ctdb/tests/simple/14_ctdb_statistics.sh
+++ b/ctdb/tests/simple/14_ctdb_statistics.sh
@@ -33,7 +33,7 @@ set -e
cluster_is_healthy
-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)$'
+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|[[:space:]]*(reclock_ctdbd|reclock_recd|call_latency|lockwait_latency|childwrite_latency)[[:space:]]+MIN/AVG/MAX[[:space:]]+[-.[:digit:]]+/[-.[:digit:]]+/[-.[:digit:]]+ sec out of [[:digit:]]+)$'
try_command_on_node -v 1 "$CTDB statistics"