summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2012-05-25 11:40:38 +1000
committerAmitay Isaacs <amitay@gmail.com>2012-05-28 11:22:28 +1000
commit0cb1cc631d535c03f6ce272150b1a89b51f34422 (patch)
tree3ebbbd3e98187979d0cd3a80eb6406e1d41a946e
parent88529e8a89eba920aab59524f50fa02eab9b5d03 (diff)
downloadsamba-0cb1cc631d535c03f6ce272150b1a89b51f34422.tar.gz
samba-0cb1cc631d535c03f6ce272150b1a89b51f34422.tar.xz
samba-0cb1cc631d535c03f6ce272150b1a89b51f34422.zip
tests: Fix ctdb_fetch test (parse extra lines of output)
Signed-off-by: Amitay Isaacs <amitay@gmail.com> (This used to be ctdb commit 0be452958db95c8253c362a1c08a1966e53a1f99)
-rwxr-xr-xctdb/tests/simple/52_ctdb_fetch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/tests/simple/52_ctdb_fetch.sh b/ctdb/tests/simple/52_ctdb_fetch.sh
index 13b3f1fafd..54405d0d9d 100755
--- a/ctdb/tests/simple/52_ctdb_fetch.sh
+++ b/ctdb/tests/simple/52_ctdb_fetch.sh
@@ -40,7 +40,7 @@ num_nodes=$(echo "$out" | wc -l)
echo "Running ctdb_fetch on all $num_nodes nodes."
try_command_on_node -v -pq all $CTDB_TEST_WRAPPER $VALGRIND ctdb_fetch -n $num_nodes
-pat='^(Fetch: [[:digit:]]+(\.[[:digit:]]+)? msgs/sec[[:space:]]?|msg_count=[[:digit:]]+ on node [[:digit:]]|Fetching final record|DATA:|Test data|Waiting for cluster[[:space:]]?|.*: Reqid wrap!|)+$'
+pat='^(Fetch: [[:digit:]]+(\.[[:digit:]]+)? msgs/sec[[:space:]]?|msg_count=[[:digit:]]+ on node [[:digit:]]|Fetching final record|DATA:|Test data|Waiting for cluster[[:space:]]?|.*: Reqid wrap!|Sleeping for [[:digit:]]+ seconds|)+$'
sanity_check_output 1 "$pat" "$out"
# Filter out the performance figures: