[CalendarServer-changes] [14411] CalDAVTester/trunk/src

[source_changes at macosforge.org]

Revision: 14411
          http://trac.calendarserver.org//changeset/14411
Author:   cdaboo at apple.com
Date:     2015-02-13 13:16:52 -0800 (Fri, 13 Feb 2015)
Log Message:
-----------
Fix trace observer. Include timing stats in JSON observer results.

Modified Paths:
--------------
    CalDAVTester/trunk/src/caldavtest.py
    CalDAVTester/trunk/src/manager.py
    CalDAVTester/trunk/src/observers/trace.py

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2015-02-13 17:36:40 UTC (rev 14410)
+++ CalDAVTester/trunk/src/caldavtest.py	2015-02-13 21:16:52 UTC (rev 14411)
@@ -226,13 +226,18 @@
                     if failed:
                         break
 
-            self.manager.testResult(testsuite, test.name, resulttxt, manager.RESULT_OK if result else manager.RESULT_FAILED)
+            addons = {}
             if len(resulttxt) > 0:
                 self.manager.message("trace", resulttxt)
             if result and test.stats:
                 self.manager.message("trace", "    Total Time: %.3f secs" % (reqstats.totaltime,), indent=8)
                 self.manager.message("trace", "    Average Time: %.3f secs" % (reqstats.totaltime / reqstats.count,), indent=8)
+                addons["timing"] = {
+                    "total": reqstats.totaltime,
+                    "average": reqstats.totaltime / reqstats.count,
+                }
             self.postgresResult(postgresCount, indent=8)
+            self.manager.testResult(testsuite, test.name, resulttxt, manager.RESULT_OK if result else manager.RESULT_FAILED, addons)
             return ["f", "t"][result]
 
 

Modified: CalDAVTester/trunk/src/manager.py
===================================================================
--- CalDAVTester/trunk/src/manager.py	2015-02-13 17:36:40 UTC (rev 14410)
+++ CalDAVTester/trunk/src/manager.py	2015-02-13 21:16:52 UTC (rev 14411)
@@ -117,12 +117,15 @@
         return testfile[-1]["tests"]
 
 
-    def testResult(self, testsuite, name, details, result,):
-        testsuite.append({
+    def testResult(self, testsuite, name, details, result, addons=None):
+        result = {
             "name": name,
             "result": result,
             "details": details
-        })
+        }
+        if addons:
+            result.update(addons)
+        testsuite.append(result)
         self.totals[result] += 1
         self.message("testResult", testsuite[-1])
 

Modified: CalDAVTester/trunk/src/observers/trace.py
===================================================================
--- CalDAVTester/trunk/src/observers/trace.py	2015-02-13 17:36:40 UTC (rev 14410)
+++ CalDAVTester/trunk/src/observers/trace.py	2015-02-13 21:16:52 UTC (rev 14411)
@@ -31,5 +31,5 @@
         })
 
 
-    def trace(self, text):
+    def trace(self, text, indent=0):
         self.manager.logit(text)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150213/c8bec8b4/attachment.html>