[CalendarServer-changes] [13795] CalendarServer/trunk/contrib/performance/loadtest

[source_changes at macosforge.org]

Revision: 13795
          http://trac.calendarserver.org//changeset/13795
Author:   cdaboo at apple.com
Date:     2014-07-25 19:53:24 -0700 (Fri, 25 Jul 2014)
Log Message:
-----------
Fix ampsim.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/ampsim.py
    CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist

Modified: CalendarServer/trunk/contrib/performance/loadtest/ampsim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/ampsim.py	2014-07-26 01:20:16 UTC (rev 13794)
+++ CalendarServer/trunk/contrib/performance/loadtest/ampsim.py	2014-07-26 02:53:24 UTC (rev 13795)
@@ -34,7 +34,7 @@
             from twisted.internet import reactor
             from twisted.internet.stdio import StandardIO
 
-            # from contrib.performance.loadtest.ampsim import Worker
+            from contrib.performance.loadtest.ampsim import Worker # @UnresolvedImport
             from contrib.performance.loadtest.sim import LagTrackingReactor
 
             StandardIO(Worker(LagTrackingReactor(reactor)))
@@ -87,6 +87,7 @@
         ("password", Unicode()),
         ("commonName", Unicode()),
         ("email", Unicode()),
+        ("guid", Unicode()),
     ]
 
 
@@ -156,7 +157,8 @@
                             uid=record.uid,
                             password=record.password,
                             commonName=record.commonName,
-                            email=record.email)
+                            email=record.email,
+                            guid=record.guid)
 
         workerConfig = deepcopy(self.loadsim.configTemplate)
         # The list of workers is for the manager only; the workers themselves
@@ -177,8 +179,7 @@
         self.output.write("Initiating worker configuration\n")
         def completed(x):
             self.output.write("Worker configuration complete.\n")
-        (self.callRemote(Configure, plist=plist)
-         .addCallback(completed))
+        self.callRemote(Configure, plist=plist).addCallback(completed)
 
 
     @LogMessage.responder

Modified: CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist	2014-07-26 01:20:16 UTC (rev 13794)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist	2014-07-26 02:53:24 UTC (rev 13795)
@@ -24,12 +24,12 @@
 							-->
 		<key>workers</key>
 		<array>
-			<string>./python contrib/performance/loadtest/ampsim.py</string>
-			<string>./python contrib/performance/loadtest/ampsim.py</string>
-			<string>./python contrib/performance/loadtest/ampsim.py</string>
-			<string>./python contrib/performance/loadtest/ampsim.py</string>
-			<string>./python contrib/performance/loadtest/ampsim.py</string>
-			<string>./python contrib/performance/loadtest/ampsim.py</string>
+			<string>./bin/python contrib/performance/loadtest/ampsim.py</string>
+			<string>./bin/python contrib/performance/loadtest/ampsim.py</string>
+			<string>./bin/python contrib/performance/loadtest/ampsim.py</string>
+			<string>./bin/python contrib/performance/loadtest/ampsim.py</string>
+			<string>./bin/python contrib/performance/loadtest/ampsim.py</string>
+			<string>./bin/python contrib/performance/loadtest/ampsim.py</string>
 		</array>
 
 		<!-- Identify the server to be load tested. -->
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140725/c412e38b/attachment-0001.html>