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

[source_changes at macosforge.org]

Revision: 15622
          http://trac.calendarserver.org//changeset/15622
Author:   sagen at apple.com
Date:     2016-05-20 10:43:52 -0700 (Fri, 20 May 2016)
Log Message:
-----------
Client sim fixes: catch exception for unparsable stats; fix the notification collection sync token when restoring from serialized sim data

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/ical.py
    CalendarServer/trunk/contrib/performance/loadtest/sim.py

Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/ical.py	2016-05-20 15:02:50 UTC (rev 15621)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py	2016-05-20 17:43:52 UTC (rev 15622)
@@ -304,7 +304,7 @@
         Convert dict (deserialized from JSON) into an L{Calendar}.
         """
 
-        coll = NotificationCollection(None, None)
+        coll = NotificationCollection(None, "")
         for attr in ("url", "changeToken"):
             if attr in data:
                 setattr(coll, attr, u2str(data[attr]))

Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/sim.py	2016-05-20 15:02:50 UTC (rev 15621)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py	2016-05-20 17:43:52 UTC (rev 15622)
@@ -575,6 +575,8 @@
             data = json.loads(data)
         except socket.error:
             data = {"Failed": "Unable to read statistics from server: %s" % (sockname,)}
+        except ValueError:
+            data = {"Failed": "Unable to parse statistics from server: %s" % (sockname,)}
         data["Server"] = sockname
         return data
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160520/0d8af3e8/attachment-0001.html>