[CalendarServer-changes] [10742] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 15 13:57:23 PST 2013
Revision: 10742
http://trac.calendarserver.org//changeset/10742
Author: cdaboo at apple.com
Date: 2013-02-15 13:57:23 -0800 (Fri, 15 Feb 2013)
Log Message:
-----------
Allow "only" option on individual tests.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd
CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd
CalDAVTester/trunk/src/caldavtest.py
CalDAVTester/trunk/src/test.py
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd 2013-02-15 21:19:17 UTC (rev 10741)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd 2013-02-15 21:57:23 UTC (rev 10742)
@@ -77,4 +77,5 @@
<!ATTLIST test name CDATA #REQUIRED
count CDATA "1"
stats (yes|no) "no"
- ignore (yes|no) "no">
+ ignore (yes|no) "no"
+ only (yes|no) "no">
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd 2013-02-15 21:19:17 UTC (rev 10741)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd 2013-02-15 21:57:23 UTC (rev 10742)
@@ -77,4 +77,5 @@
<!ATTLIST test name CDATA #REQUIRED
count CDATA "1"
stats (yes|no) "no"
- ignore (yes|no) "no">
+ ignore (yes|no) "no"
+ only (yes|no) "no">
Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py 2013-02-15 21:19:17 UTC (rev 10741)
+++ CalDAVTester/trunk/src/caldavtest.py 2013-02-15 21:57:23 UTC (rev 10742)
@@ -159,8 +159,9 @@
if self.manager.memUsage:
start_usage = self.manager.getMemusage()
etags = {}
+ only_tests = any([test.only for test in suite.tests])
for test in suite.tests:
- result = self.run_test(test, etags, label="%s | %s" % (label, test.name))
+ result = self.run_test(test, etags, only_tests, label="%s | %s" % (label, test.name))
if result == "t":
ok += 1
elif result == "f":
@@ -177,11 +178,11 @@
return (ok, failed, ignored)
- def run_test(self, test, etags, label=""):
+ def run_test(self, test, etags, only, label=""):
descriptor = " Test: %s" % test.name
descriptor += " " * max(1, STATUSTXT_WIDTH - len(descriptor))
self.manager.log(manager.LOG_HIGH, "%s" % (descriptor,), before=1, after=0)
- if test.ignore:
+ if test.ignore or only and not test.only:
self.manager.log(manager.LOG_HIGH, "[IGNORED]")
return "i"
elif len(test.missingFeatures()) != 0:
Modified: CalDAVTester/trunk/src/test.py
===================================================================
--- CalDAVTester/trunk/src/test.py 2013-02-15 21:19:17 UTC (rev 10741)
+++ CalDAVTester/trunk/src/test.py 2013-02-15 21:57:23 UTC (rev 10742)
@@ -36,6 +36,7 @@
self.count = 1
self.stats = False
self.ignore = False
+ self.only = False
self.require_features = set()
self.exclude_features = set()
self.description = ""
@@ -56,6 +57,7 @@
self.count = int(node.get(src.xmlDefs.ATTR_COUNT, 1))
self.stats = getYesNoAttributeValue(node, src.xmlDefs.ATTR_STATS)
self.ignore = getYesNoAttributeValue(node, src.xmlDefs.ATTR_IGNORE)
+ self.only = getYesNoAttributeValue(node, src.xmlDefs.ATTR_ONLY)
for child in node.getchildren():
if child.tag == src.xmlDefs.ELEMENT_REQUIRE_FEATURE:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130215/d1e24e7a/attachment.html>
More information about the calendarserver-changes
mailing list