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

[source_changes at macosforge.org]

Revision: 12674
          http://trac.calendarserver.org//changeset/12674
Author:   cdaboo at apple.com
Date:     2014-02-12 07:30:33 -0800 (Wed, 12 Feb 2014)
Log Message:
-----------
Better failure logging.

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

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2014-02-12 08:12:19 UTC (rev 12673)
+++ CalDAVTester/trunk/src/caldavtest.py	2014-02-12 15:30:33 UTC (rev 12674)
@@ -197,6 +197,9 @@
                     while t > time.time():
                         failed = False
                         if getattr(req, "iterate_data", False):
+                            if not req.hasNextData():
+                                self.manager.testResult(testsuite, test.name, "      No iteration data - ignored", manager.RESULT_IGNORED)
+                                return "i"
                             while req.getNextData():
                                 result, resulttxt, _ignore_response, _ignore_respdata = self.dorequest(req, test.details, True, False, reqstats, etags=etags, label="%s | #%s" % (label, req_count + 1,), count=ctr + 1)
                                 if not result:

Modified: CalDAVTester/trunk/src/manager.py
===================================================================
--- CalDAVTester/trunk/src/manager.py	2014-02-12 08:12:19 UTC (rev 12673)
+++ CalDAVTester/trunk/src/manager.py	2014-02-12 15:30:33 UTC (rev 12674)
@@ -93,6 +93,8 @@
             "result": result,
             "tests": []
         })
+        if result is not None:
+            self.totals[result] += 1
         self.message("testFile", self.results[-1])
         return self.results[-1]["tests"]
 
@@ -104,6 +106,8 @@
             "result": result,
             "tests": []
         })
+        if result is not None:
+            self.totals[result] += 1
         self.message("testSuite", testfile[-1])
         return testfile[-1]["tests"]
 

Modified: CalDAVTester/trunk/src/observers/log.py
===================================================================
--- CalDAVTester/trunk/src/observers/log.py	2014-02-12 08:12:19 UTC (rev 12673)
+++ CalDAVTester/trunk/src/observers/log.py	2014-02-12 15:30:33 UTC (rev 12674)
@@ -59,12 +59,27 @@
         self.currentFile = result["name"].replace("/", ".")[:-4]
         self.manager.logit("")
         self._logResult(self.currentFile, result)
+        if result["result"] in (manager.RESULT_FAILED, manager.RESULT_ERROR):
+            failtxt = "{result}\n{details}\n\n{file}".format(
+                result=self.RESULT_STRINGS[result["result"]],
+                details=result["details"],
+                file=self.currentFile,
+            )
+            self.loggedFailures.append(failtxt)
 
 
     def testSuite(self, result):
         self.currentSuite = result["name"]
         result_name = "  Suite: " + result["name"]
         self._logResult(result_name, result)
+        if result["result"] in (manager.RESULT_FAILED, manager.RESULT_ERROR):
+            failtxt = "{result}\n{details}\n\n{file}/{suite}".format(
+                result=self.RESULT_STRINGS[result["result"]],
+                details=result["details"],
+                file=self.currentFile,
+                suite=self.currentSuite,
+            )
+            self.loggedFailures.append(failtxt)
 
 
     def testResult(self, result):

Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py	2014-02-12 08:12:19 UTC (rev 12673)
+++ CalDAVTester/trunk/src/request.py	2014-02-12 15:30:33 UTC (rev 12674)
@@ -319,6 +319,11 @@
             return False
 
 
+    def hasNextData(self):
+        dataList = sorted([path for path in os.listdir(self.data.filepath) if not path.startswith(".")])
+        return len(dataList) != 0
+
+
     def generateCalendarData(self, data):
         """
         FIXME: does not work for events with recurrence overrides.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/bbd25be0/attachment.html>