From 16ac03579aef6a558a99943eab0c20ed5cdb69e9 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Fri, 25 Sep 2009 12:42:50 +0100 Subject: [PATCH] Make sure we have XML messages for use with with xpathselect, for example --- test/performance/src/receiver_grinder_util.py | 2 +- test/performance/src/xml-messages.txt | 1 + test/performance/tests/new-thrash/sender.properties | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 test/performance/src/xml-messages.txt diff --git a/test/performance/src/receiver_grinder_util.py b/test/performance/src/receiver_grinder_util.py index 97091d8..1c756b7 100644 --- a/test/performance/src/receiver_grinder_util.py +++ b/test/performance/src/receiver_grinder_util.py @@ -12,7 +12,7 @@ grinder.statistics.registerSummaryExpression("Mean delivery time (ms)", "(/ userLong1 (count timedTests))") -EXTRACT_ID_RE = re.compile(r".*\|\|MSG_ID=(.*)\|\|$") +EXTRACT_ID_RE = re.compile(r".*\|\|MSG_ID=(.*)\|\|.*$") class ReceiverTestRunner(FeedsTestRunner): diff --git a/test/performance/src/xml-messages.txt b/test/performance/src/xml-messages.txt new file mode 100644 index 0000000..a27f2a5 --- /dev/null +++ b/test/performance/src/xml-messages.txt @@ -0,0 +1 @@ +MSG_ID diff --git a/test/performance/tests/new-thrash/sender.properties b/test/performance/tests/new-thrash/sender.properties index e6da40d..7b7f186 100644 --- a/test/performance/tests/new-thrash/sender.properties +++ b/test/performance/tests/new-thrash/sender.properties @@ -43,12 +43,12 @@ streams.test.msg_rate=0 # The file containing the message set to send. Each line in the file is treated # as a message. There is no default value. -streams.test.message_set_file=test/performance/src/test-messages.txt +streams.test.message_set_file=test/performance/src/xml-messages.txt # The regular expression to use to extract messages from the source file. The # default is -#streams.test.extract_msg_re= +streams.test.extract_msg_re=(.*) # The regular expression to use to insert an ID into a message. The default is # $, i.e., at the end of the message -#streams.test.insert_id_re= \ No newline at end of file +streams.test.insert_id_re=MSG_ID \ No newline at end of file