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

[source_changes at macosforge.org]

Revision: 12649
          http://trac.calendarserver.org//changeset/12649
Author:   cdaboo at apple.com
Date:     2014-02-11 09:16:05 -0800 (Tue, 11 Feb 2014)
Log Message:
-----------
Tweaks to logging output.

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

Added Paths:
-----------
    CalDAVTester/trunk/src/observers/loadfiles.py

Modified: CalDAVTester/trunk/src/manager.py
===================================================================
--- CalDAVTester/trunk/src/manager.py	2014-02-11 17:13:48 UTC (rev 12648)
+++ CalDAVTester/trunk/src/manager.py	2014-02-11 17:16:05 UTC (rev 12649)
@@ -158,7 +158,8 @@
         self.server_info.addsubs(moresubs)
 
         for ctr, testfile in enumerate(testfiles):
-            print "\rTest File {} of {}".format(ctr + 1, len(testfiles)),
+            self.message("load", testfile, ctr + 1, len(testfiles))
+
             # Open and parse the config file
             try:
                 tree = ElementTree(file=testfile)
@@ -183,7 +184,7 @@
             if not all or not test.ignore_all:
                 self.tests.append(test)
 
-        print ""
+        self.message("load", None, ctr + 1, len(testfiles))
 
 
     def readCommandLine(self):
@@ -287,7 +288,7 @@
             self.randomSeed = random_seed
 
         # Load observers
-        map(lambda name: self.loadObserver(name), observer_names if observer_names else ["log", ])
+        map(lambda name: self.loadObserver(name), observer_names if observer_names else ["loadfiles", "log", ])
 
         self.readXML(sname, fnames, ssl, all)
 

Added: CalDAVTester/trunk/src/observers/loadfiles.py
===================================================================
--- CalDAVTester/trunk/src/observers/loadfiles.py	                        (rev 0)
+++ CalDAVTester/trunk/src/observers/loadfiles.py	2014-02-11 17:16:05 UTC (rev 12649)
@@ -0,0 +1,46 @@
+##
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from src.observers.base import BaseResultsObserver
+
+class Observer(BaseResultsObserver):
+    """
+    A results observer that prints when a test file is loaded.
+    """
+
+    def updateCalls(self):
+        super(Observer, self).updateCalls()
+        self._calls.update({
+            "load": self.load,
+        })
+
+
+    def load(self, name, current, total):
+        """
+        Message triggered when loading a script file.
+
+        @param name: name of file being loaded, or L{None} for last file
+        @type name: L{str}
+        @param current: current number of files loaded
+        @type current: L{int}
+        @param total: total number of files to load
+        @type total: L{int}
+        """
+
+        if name is not None:
+            self.manager.logit("Loading {current} of {total}: {name}".format(current=current, total=total, name=name))
+        else:
+            self.manager.logit("Loading files complete.\n")

Modified: CalDAVTester/trunk/src/observers/log.py
===================================================================
--- CalDAVTester/trunk/src/observers/log.py	2014-02-11 17:13:48 UTC (rev 12648)
+++ CalDAVTester/trunk/src/observers/log.py	2014-02-11 17:16:05 UTC (rev 12649)
@@ -71,7 +71,13 @@
         result_name = "    Test: " + result["name"]
         self._logResult(result_name, result)
         if result["result"] in (manager.RESULT_FAILED, manager.RESULT_ERROR):
-            failtxt = "{}/{}/{}\n{}".format(self.currentFile, self.currentSuite, result["name"], result["details"])
+            failtxt = "{result}\n{details}\n\n{file}/{suite}/{test}".format(
+                result=self.RESULT_STRINGS[result["result"]],
+                details=result["details"],
+                file=self.currentFile,
+                suite=self.currentSuite,
+                test=result["name"],
+            )
             self.loggedFailures.append(failtxt)
 
 
@@ -89,19 +95,23 @@
         self.manager.logit("")
         if self.manager.totals[manager.RESULT_FAILED] + self.manager.totals[manager.RESULT_ERROR] != 0:
             for failed in self.loggedFailures:
-                self.manager.logit("******")
+                self.manager.logit("=" * 70)
                 self.manager.logit(failed)
-            overall = "******\n\nFAILED (ok={}, ignored={}, failed={}, errors={}) Time = {:.3f} secs".format(
+            overall = "FAILED (ok={}, ignored={}, failed={}, errors={})".format(
                 self.manager.totals[manager.RESULT_OK],
                 self.manager.totals[manager.RESULT_IGNORED],
                 self.manager.totals[manager.RESULT_FAILED],
                 self.manager.totals[manager.RESULT_ERROR],
-                self.manager.timeDiff
             )
         else:
-            overall = "PASSED (ok={}, ignored={}) Time = {:.3f} secs".format(
+            overall = "PASSED (ok={}, ignored={})".format(
                 self.manager.totals[manager.RESULT_OK],
                 self.manager.totals[manager.RESULT_IGNORED],
-                self.manager.timeDiff
             )
+        self.manager.logit("-" * 70)
+        self.manager.logit("Ran {total} tests in {time:.3f}s\n".format(
+            total=sum(self.manager.totals.values()),
+            time=self.manager.timeDiff,
+        ))
+
         self.manager.logit(overall)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/799f6d6a/attachment.html>