[CalendarServer-changes] [13616] CalendarServer/trunk/contrib/od/test/test_live.py

[source_changes at macosforge.org]

Revision: 13616
          http://trac.calendarserver.org//changeset/13616
Author:   sagen at apple.com
Date:     2014-06-06 14:12:10 -0700 (Fri, 06 Jun 2014)
Log Message:
-----------
Add a (skipped) test for a compound expression with multiple record types

Modified Paths:
--------------
    CalendarServer/trunk/contrib/od/test/test_live.py

Modified: CalendarServer/trunk/contrib/od/test/test_live.py
===================================================================
--- CalendarServer/trunk/contrib/od/test/test_live.py	2014-06-06 21:07:05 UTC (rev 13615)
+++ CalendarServer/trunk/contrib/od/test/test_live.py	2014-06-06 21:12:10 UTC (rev 13616)
@@ -159,7 +159,7 @@
             )
             records = yield self.service.recordsFromExpression(expression)
 
-            # We should get back users and groups:
+            # We should get back users and groups since we did not specify a type:
             self.verifyResults(
                 records,
                 ["odtestbetty", "odtestalbert", "anotherodtestalbert", "odtestgroupbetty", "odtestgroupalbert"],
@@ -222,7 +222,7 @@
 
         @onlyIfPopulated
         @inlineCallbacks
-        def test_compoundWithSingleRecordType(self):
+        def test_compoundWithMultipleRecordTypes(self):
             expression = CompoundExpression(
                 [
                     CompoundExpression(
@@ -256,17 +256,27 @@
                         ],
                         Operand.AND
                     ),
-                    MatchExpression(
-                        self.service.fieldName.recordType, self.service.recordType.user,
+                    CompoundExpression(
+                        [
+                            MatchExpression(
+                                self.service.fieldName.recordType, self.service.recordType.user,
+                            ),
+                            MatchExpression(
+                                self.service.fieldName.recordType, self.service.recordType.group,
+                            ),
+                        ],
+                        Operand.OR
                     ),
                 ],
                 Operand.AND
             )
             records = yield self.service.recordsFromExpression(expression)
 
-            # We should only get users back, not groups:
+            # We should get users and groups back, since we asked for either type:
             self.verifyResults(
                 records,
-                ["odtestbetty", "odtestalbert", "anotherodtestalbert"],
-                ["odtestamanda", "odtestbill", "odtestgroupa", "odtestgroupb", "odtestgroupbetty", "odtestgroupalbert"]
+                ["odtestbetty", "odtestalbert", "anotherodtestalbert", "odtestgroupbetty", "odtestgroupalbert"],
+                ["odtestamanda", "odtestbill", "odtestgroupa", "odtestgroupb"]
             )
+
+        test_compoundWithMultipleRecordTypes.skip = "This ends up doing a brute force query!"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140606/9697fe6c/attachment.html>