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

[source_changes at macosforge.org]

Revision: 9440
          http://trac.macosforge.org/projects/calendarserver/changeset/9440
Author:   dre at apple.com
Date:     2012-07-12 13:28:44 -0700 (Thu, 12 Jul 2012)
Log Message:
-----------
Actually use thresholds.json if present

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/population.py
    CalendarServer/trunk/contrib/performance/loadtest/profiles.py

Modified: CalendarServer/trunk/contrib/performance/loadtest/population.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/population.py	2012-07-12 19:54:09 UTC (rev 9439)
+++ CalendarServer/trunk/contrib/performance/loadtest/population.py	2012-07-12 20:28:44 UTC (rev 9440)
@@ -381,7 +381,7 @@
         # Load parameters from config 
         if "thresholdsPath" in params:
             jsondata = json.load(open(params["thresholdsPath"]))
-        if "thresholds" in params:
+        elif "thresholds" in params:
             jsondata = params["thresholds"]
         else:
             jsondata = self._thresholds_default

Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/profiles.py	2012-07-12 19:54:09 UTC (rev 9439)
+++ CalendarServer/trunk/contrib/performance/loadtest/profiles.py	2012-07-12 20:28:44 UTC (rev 9440)
@@ -747,7 +747,7 @@
         # Load parameters from config 
         if "thresholdsPath" in params:
             jsondata = json.load(open(params["thresholdsPath"]))
-        if "thresholds" in params:
+        elif "thresholds" in params:
             jsondata = params["thresholds"]
         else:
             jsondata = self._thresholds_default
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120712/7763ecc6/attachment.html>