From 908089f70a4036d9baa3da44c8a054632d6e6cb5 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 14 Jan 2011 22:57:04 +0000
Subject: [PATCH] NIHVIVO-1129 make the release 1.1.1 tests multi-threaded
 also.

---
 .../tests/SecondTests-rel-1-1-1.jmx           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/utilities/load-testing/tests/SecondTests-rel-1-1-1.jmx b/utilities/load-testing/tests/SecondTests-rel-1-1-1.jmx
index fdd93ad5..542ffbdc 100644
--- a/utilities/load-testing/tests/SecondTests-rel-1-1-1.jmx
+++ b/utilities/load-testing/tests/SecondTests-rel-1-1-1.jmx
@@ -9,32 +9,37 @@
         <collectionProp name="Arguments.arguments">
           <elementProp name="WEBAPP_HOST" elementType="Argument">
             <stringProp name="Argument.name">WEBAPP_HOST</stringProp>
-            <stringProp name="Argument.value">${__property(webapp.host, localhost)}</stringProp>
+            <stringProp name="Argument.value">${__property(webapp.host, , localhost)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="WEBAPP_PORT" elementType="Argument">
             <stringProp name="Argument.name">WEBAPP_PORT</stringProp>
-            <stringProp name="Argument.value">${__property(webapp.port, 8080)}</stringProp>
+            <stringProp name="Argument.value">${__property(webapp.port, , 8080)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="WEBAPP_NAME" elementType="Argument">
             <stringProp name="Argument.name">WEBAPP_NAME</stringProp>
-            <stringProp name="Argument.value">${__property(webapp.name, vivo)}</stringProp>
+            <stringProp name="Argument.value">${__property(webapp.name, , vivo)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="PERSON_URI_FILE" elementType="Argument">
             <stringProp name="Argument.name">PERSON_URI_FILE</stringProp>
-            <stringProp name="Argument.value">${__property(file.person.uris, PersonUris.csv)}</stringProp>
+            <stringProp name="Argument.value">${__property(file.person.uris, , PersonUris.csv)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="INFO_RESOURCE_URI_FILE" elementType="Argument">
             <stringProp name="Argument.name">INFO_RESOURCE_URI_FILE</stringProp>
-            <stringProp name="Argument.value">${__property(file.infoResource.uris, InfoResourceUris.csv)}</stringProp>
+            <stringProp name="Argument.value">${__property(file.infoResource.uris, , InfoResourceUris.csv)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="ITERATIONS" elementType="Argument">
             <stringProp name="Argument.name">ITERATIONS</stringProp>
-            <stringProp name="Argument.value">${__property(iterations, 10)}</stringProp>
+            <stringProp name="Argument.value">${__property(iterations, , 10)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="THREADS" elementType="Argument">
+            <stringProp name="Argument.name">THREADS</stringProp>
+            <stringProp name="Argument.value">${__property(threads, , 1)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -48,7 +53,7 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">${ITERATIONS}</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.num_threads">${THREADS}</stringProp>
         <stringProp name="ThreadGroup.ramp_time">1</stringProp>
         <longProp name="ThreadGroup.start_time">1294759350000</longProp>
         <longProp name="ThreadGroup.end_time">1294759350000</longProp>