Revision: 9307 http://trac.macosforge.org/projects/calendarserver/changeset/9307 Author: cdaboo@apple.com Date: 2012-05-29 09:21:12 -0700 (Tue, 29 May 2012) Log Message: ----------- Missed these changes. 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-05-29 15:25:50 UTC (rev 9306) +++ CalendarServer/trunk/contrib/performance/loadtest/population.py 2012-05-29 16:21:12 UTC (rev 9307) @@ -367,7 +367,7 @@ # Load parameters from config if "thresholdsPath" in params: - jsondata = json.load(open(params["thresholds"])) + jsondata = json.load(open(params["thresholdsPath"])) if "thresholds" in params: jsondata = params["thresholds"] else: Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py =================================================================== --- CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2012-05-29 15:25:50 UTC (rev 9306) +++ CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2012-05-29 16:21:12 UTC (rev 9307) @@ -704,7 +704,7 @@ # the response time thresholds to display together with failing % count threshold _thresholds_default = { - "requests":{ + "operations":{ "limits": [ 0.1, 0.5, 1.0, 3.0, 5.0, 10.0, 30.0], "thresholds":{ "default":[ 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0], @@ -737,7 +737,7 @@ # Load parameters from config if "thresholdsPath" in params: - jsondata = json.load(open(params["thresholds"])) + jsondata = json.load(open(params["thresholdsPath"])) if "thresholds" in params: jsondata = params["thresholds"] else: