[CalendarServer-changes] [13162] CalendarServer/branches/users/sagen/move2who-5

[source_changes at macosforge.org]

Revision: 13162
          http://trac.calendarserver.org//changeset/13162
Author:   sagen at apple.com
Date:     2014-04-04 12:03:14 -0700 (Fri, 04 Apr 2014)
Log Message:
-----------
Fix more tests

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-5/twistedcaldav/directory/test/accounts.xml
    CalendarServer/branches/users/sagen/move2who-5/twistedcaldav/directory/test/test_principal.py
    CalendarServer/branches/users/sagen/move2who-5/txdav/dps/test/test_client.py

Modified: CalendarServer/branches/users/sagen/move2who-5/twistedcaldav/directory/test/accounts.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-5/twistedcaldav/directory/test/accounts.xml	2014-04-04 18:48:29 UTC (rev 13161)
+++ CalendarServer/branches/users/sagen/move2who-5/twistedcaldav/directory/test/accounts.xml	2014-04-04 19:03:14 UTC (rev 13162)
@@ -68,7 +68,7 @@
     <uid>37DB0C90-4DB1-4932-BC69-3DAB66F374F5</uid>
     <guid>37DB0C90-4DB1-4932-BC69-3DAB66F374F5</guid>
     <password>purgeuser</password>
-    <name>Purge User</name>
+    <full-name>Purge User</full-name>
     <email-address>purgeuser at example.com</email-address>
   </user>
   <record type="user">

Modified: CalendarServer/branches/users/sagen/move2who-5/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-5/twistedcaldav/directory/test/test_principal.py	2014-04-04 18:48:29 UTC (rev 13161)
+++ CalendarServer/branches/users/sagen/move2who-5/twistedcaldav/directory/test/test_principal.py	2014-04-04 19:03:14 UTC (rev 13162)
@@ -534,8 +534,7 @@
         for (
             provisioningResource, recordType, recordResource, record
         ) in (yield self._allRecords()):
-            if True:  # user.enabled:
-                self.failUnless(recordResource.displayName())
+            self.failUnless(recordResource.displayName())
 
 
     @inlineCallbacks

Modified: CalendarServer/branches/users/sagen/move2who-5/txdav/dps/test/test_client.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-5/txdav/dps/test/test_client.py	2014-04-04 18:48:29 UTC (rev 13161)
+++ CalendarServer/branches/users/sagen/move2who-5/txdav/dps/test/test_client.py	2014-04-04 19:03:14 UTC (rev 13162)
@@ -375,7 +375,7 @@
         records = (yield self.client.recordsWithRecordType(
             RecordType.user
         ))
-        self.assertEquals(len(records), 35)
+        self.assertEquals(len(records), 34)
 
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140404/35b82575/attachment.html>