[CalendarServer-changes] [13675] CalDAVTester/trunk/src/manager.py

[source_changes at macosforge.org]

Revision: 13675
          http://trac.calendarserver.org//changeset/13675
Author:   cdaboo at apple.com
Date:     2014-06-23 13:23:42 -0700 (Mon, 23 Jun 2014)
Log Message:
-----------
Make sure pre/post tests don't cause a total failure when a regular test has failed.

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

Modified: CalDAVTester/trunk/src/manager.py
===================================================================
--- CalDAVTester/trunk/src/manager.py	2014-06-23 18:00:59 UTC (rev 13674)
+++ CalDAVTester/trunk/src/manager.py	2014-06-23 20:23:42 UTC (rev 13675)
@@ -347,12 +347,9 @@
             for test in self.tests:
                 if self.pretest is not None:
                     o, f, i = self.pretest.run()
-                    ok += o
-                    failed += f
-                    ignored += i
 
                     # Always stop the tests if the pretest fails
-                    if failed != 0:
+                    if f != 0:
                         break
 
                 o, f, i = test.run()
@@ -365,12 +362,9 @@
 
                 if self.posttest is not None:
                     o, f, i = self.posttest.run()
-                    ok += o
-                    failed += f
-                    ignored += i
 
                     # Always stop the tests if the posttest fails
-                    if failed != 0:
+                    if f != 0:
                         break
 
         except:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140623/9160e00f/attachment.html>