[CalendarServer-changes] [13057] CalendarServer/branches/users/sagen/move2who-4
source_changes at macosforge.org
source_changes at macosforge.org
Mon Mar 31 11:22:48 PDT 2014
Revision: 13057
http://trac.calendarserver.org//changeset/13057
Author: sagen at apple.com
Date: 2014-03-31 11:22:48 -0700 (Mon, 31 Mar 2014)
Log Message:
-----------
Fix more tests
Modified Paths:
--------------
CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py
CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml
CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml
CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml
CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml
CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml
CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py
CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py
CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py
CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py
Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py 2014-03-31 18:22:48 UTC (rev 13057)
@@ -931,25 +931,7 @@
uuid3 = "AC478592-7783-44D1-B2AE-52359B4E8415"
uuidl1 = "75EA36BE-F71B-40F9-81F9-CF59BF40CA8F"
- def configure(self):
- super(CalVerifyMismatchTestsBase, self).configure()
- self.patch(config.DirectoryService.params, "xmlFile",
- os.path.join(
- os.path.dirname(__file__), "calverify", "accounts.xml"
- )
- )
- self.patch(config.ResourceService.params, "xmlFile",
- os.path.join(
- os.path.dirname(__file__), "calverify", "resources.xml"
- )
- )
- self.patch(config.AugmentService.params, "xmlFiles",
- [os.path.join(
- os.path.dirname(__file__), "calverify", "augments.xml"
- ), ]
- )
-
@inlineCallbacks
def populate(self):
Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml 2014-03-31 18:22:48 UTC (rev 13057)
@@ -19,6 +19,7 @@
<!DOCTYPE accounts SYSTEM "accounts.dtd">
<directory realm="Test Realm">
+
<record type="user">
<uid>admin</uid>
<short-name>admin</short-name>
@@ -74,363 +75,951 @@
<full-name>まだ</full-name>
</record>
- <!-- twext.who xml doesn't (yet) support repeat
- <user repeat="101">
- <uid>user%02d</uid>
- <uid>User %02d</uid>
- <short-name>user%02d</short-name>
- <password>user%02d</password>
- <full-name>User %02d</full-name>
- <email>user%02d at example.com</email>
+ <record type="group">
+ <uid>group01</uid>
+ <short-name>group01</short-name>
+ <password>group01</password>
+ <full-name>Group 01</full-name>
+ <member-uid>user01</member-uid>
</record>
- <user repeat="10">
- <uid>public%02d</uid>
- <short-name>public%02d</short-name>
- <password>public%02d</password>
- <full-name>Public %02d</full-name>
+ <record type="group">
+ <uid>group02</uid>
+ <short-name>group02</short-name>
+ <password>group02</password>
+ <full-name>Group 02</full-name>
+ <member-uid >user06</member-uid>
+ <member-uid >user07</member-uid>
</record>
- -->
- <record type="user">
+ <record type="group">
+ <uid>group03</uid>
+ <short-name>group03</short-name>
+ <password>group03</password>
+ <full-name>Group 03</full-name>
+ <member-uid>user08</member-uid>
+ <member-uid>user09</member-uid>
+ </record>
+ <record type="group">
+ <uid>group04</uid>
+ <short-name>group04</short-name>
+ <password>group04</password>
+ <full-name>Group 04</full-name>
+ <member-uid>group02</member-uid>
+ <member-uid>group03</member-uid>
+ <member-uid>user10</member-uid>
+ </record>
+ <record type="group"> <!-- delegategroup -->
+ <uid>group05</uid>
+ <short-name>group05</short-name>
+ <password>group05</password>
+ <full-name>Group 05</full-name>
+ <member-uid>group06</member-uid>
+ <member-uid>user20</member-uid>
+ </record>
+ <record type="group"> <!-- delegatesubgroup -->
+ <uid>group06</uid>
+ <short-name>group06</short-name>
+ <password>group06</password>
+ <full-name>Group 06</full-name>
+ <member-uid>user21</member-uid>
+ </record>
+ <record type="group"> <!-- readonlydelegategroup -->
+ <uid>group07</uid>
+ <short-name>group07</short-name>
+ <password>group07</password>
+ <full-name>Group 07</full-name>
+ <member-uid>user22</member-uid>
+ <member-uid>user23</member-uid>
+ <member-uid>user24</member-uid>
+ </record>
+ <record type="group">
+ <uid>disabledgroup</uid>
+ <short-name>disabledgroup</short-name>
+ <password>disabledgroup</password>
+ <full-name>Disabled Group</full-name>
+ <member-uid>user01</member-uid>
+ </record>
+
+
+<!-- Generated records -->
+
+<record type="user">
<short-name>user01</short-name>
<uid>user01</uid>
<password>user01</password>
<full-name>User 01</full-name>
<email>user01 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user02</short-name>
<uid>user02</uid>
<password>user02</password>
<full-name>User 02</full-name>
<email>user02 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user03</short-name>
<uid>user03</uid>
<password>user03</password>
<full-name>User 03</full-name>
<email>user03 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user04</short-name>
<uid>user04</uid>
<password>user04</password>
<full-name>User 04</full-name>
<email>user04 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user05</short-name>
<uid>user05</uid>
<password>user05</password>
<full-name>User 05</full-name>
<email>user05 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user06</short-name>
<uid>user06</uid>
<password>user06</password>
<full-name>User 06</full-name>
<email>user06 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user07</short-name>
<uid>user07</uid>
<password>user07</password>
<full-name>User 07</full-name>
<email>user07 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user08</short-name>
<uid>user08</uid>
<password>user08</password>
<full-name>User 08</full-name>
<email>user08 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user09</short-name>
<uid>user09</uid>
<password>user09</password>
<full-name>User 09</full-name>
<email>user09 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user10</short-name>
<uid>user10</uid>
<password>user10</password>
<full-name>User 10</full-name>
<email>user10 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user11</short-name>
<uid>user11</uid>
<password>user11</password>
<full-name>User 11</full-name>
<email>user11 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user12</short-name>
<uid>user12</uid>
<password>user12</password>
<full-name>User 12</full-name>
<email>user12 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user13</short-name>
<uid>user13</uid>
<password>user13</password>
<full-name>User 13</full-name>
<email>user13 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user14</short-name>
<uid>user14</uid>
<password>user14</password>
<full-name>User 14</full-name>
<email>user14 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user15</short-name>
<uid>user15</uid>
<password>user15</password>
<full-name>User 15</full-name>
<email>user15 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user16</short-name>
<uid>user16</uid>
<password>user16</password>
<full-name>User 16</full-name>
<email>user16 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user17</short-name>
<uid>user17</uid>
<password>user17</password>
<full-name>User 17</full-name>
<email>user17 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user18</short-name>
<uid>user18</uid>
<password>user18</password>
<full-name>User 18</full-name>
<email>user18 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user19</short-name>
<uid>user19</uid>
<password>user19</password>
<full-name>User 19</full-name>
<email>user19 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user20</short-name>
<uid>user20</uid>
<password>user20</password>
<full-name>User 20</full-name>
<email>user20 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user21</short-name>
<uid>user21</uid>
<password>user21</password>
<full-name>User 21</full-name>
<email>user21 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user22</short-name>
<uid>user22</uid>
<password>user22</password>
<full-name>User 22</full-name>
<email>user22 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user23</short-name>
<uid>user23</uid>
<password>user23</password>
<full-name>User 23</full-name>
<email>user23 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user24</short-name>
<uid>user24</uid>
<password>user24</password>
<full-name>User 24</full-name>
<email>user24 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>user25</short-name>
<uid>user25</uid>
<password>user25</password>
<full-name>User 25</full-name>
<email>user25 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
+ <short-name>user26</short-name>
+ <uid>user26</uid>
+ <password>user26</password>
+ <full-name>User 26</full-name>
+ <email>user26 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user27</short-name>
+ <uid>user27</uid>
+ <password>user27</password>
+ <full-name>User 27</full-name>
+ <email>user27 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user28</short-name>
+ <uid>user28</uid>
+ <password>user28</password>
+ <full-name>User 28</full-name>
+ <email>user28 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user29</short-name>
+ <uid>user29</uid>
+ <password>user29</password>
+ <full-name>User 29</full-name>
+ <email>user29 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user30</short-name>
+ <uid>user30</uid>
+ <password>user30</password>
+ <full-name>User 30</full-name>
+ <email>user30 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user31</short-name>
+ <uid>user31</uid>
+ <password>user31</password>
+ <full-name>User 31</full-name>
+ <email>user31 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user32</short-name>
+ <uid>user32</uid>
+ <password>user32</password>
+ <full-name>User 32</full-name>
+ <email>user32 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user33</short-name>
+ <uid>user33</uid>
+ <password>user33</password>
+ <full-name>User 33</full-name>
+ <email>user33 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user34</short-name>
+ <uid>user34</uid>
+ <password>user34</password>
+ <full-name>User 34</full-name>
+ <email>user34 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user35</short-name>
+ <uid>user35</uid>
+ <password>user35</password>
+ <full-name>User 35</full-name>
+ <email>user35 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user36</short-name>
+ <uid>user36</uid>
+ <password>user36</password>
+ <full-name>User 36</full-name>
+ <email>user36 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user37</short-name>
+ <uid>user37</uid>
+ <password>user37</password>
+ <full-name>User 37</full-name>
+ <email>user37 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user38</short-name>
+ <uid>user38</uid>
+ <password>user38</password>
+ <full-name>User 38</full-name>
+ <email>user38 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user39</short-name>
+ <uid>user39</uid>
+ <password>user39</password>
+ <full-name>User 39</full-name>
+ <email>user39 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user40</short-name>
+ <uid>user40</uid>
+ <password>user40</password>
+ <full-name>User 40</full-name>
+ <email>user40 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user41</short-name>
+ <uid>user41</uid>
+ <password>user41</password>
+ <full-name>User 41</full-name>
+ <email>user41 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user42</short-name>
+ <uid>user42</uid>
+ <password>user42</password>
+ <full-name>User 42</full-name>
+ <email>user42 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user43</short-name>
+ <uid>user43</uid>
+ <password>user43</password>
+ <full-name>User 43</full-name>
+ <email>user43 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user44</short-name>
+ <uid>user44</uid>
+ <password>user44</password>
+ <full-name>User 44</full-name>
+ <email>user44 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user45</short-name>
+ <uid>user45</uid>
+ <password>user45</password>
+ <full-name>User 45</full-name>
+ <email>user45 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user46</short-name>
+ <uid>user46</uid>
+ <password>user46</password>
+ <full-name>User 46</full-name>
+ <email>user46 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user47</short-name>
+ <uid>user47</uid>
+ <password>user47</password>
+ <full-name>User 47</full-name>
+ <email>user47 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user48</short-name>
+ <uid>user48</uid>
+ <password>user48</password>
+ <full-name>User 48</full-name>
+ <email>user48 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user49</short-name>
+ <uid>user49</uid>
+ <password>user49</password>
+ <full-name>User 49</full-name>
+ <email>user49 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user50</short-name>
+ <uid>user50</uid>
+ <password>user50</password>
+ <full-name>User 50</full-name>
+ <email>user50 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user51</short-name>
+ <uid>user51</uid>
+ <password>user51</password>
+ <full-name>User 51</full-name>
+ <email>user51 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user52</short-name>
+ <uid>user52</uid>
+ <password>user52</password>
+ <full-name>User 52</full-name>
+ <email>user52 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user53</short-name>
+ <uid>user53</uid>
+ <password>user53</password>
+ <full-name>User 53</full-name>
+ <email>user53 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user54</short-name>
+ <uid>user54</uid>
+ <password>user54</password>
+ <full-name>User 54</full-name>
+ <email>user54 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user55</short-name>
+ <uid>user55</uid>
+ <password>user55</password>
+ <full-name>User 55</full-name>
+ <email>user55 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user56</short-name>
+ <uid>user56</uid>
+ <password>user56</password>
+ <full-name>User 56</full-name>
+ <email>user56 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user57</short-name>
+ <uid>user57</uid>
+ <password>user57</password>
+ <full-name>User 57</full-name>
+ <email>user57 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user58</short-name>
+ <uid>user58</uid>
+ <password>user58</password>
+ <full-name>User 58</full-name>
+ <email>user58 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user59</short-name>
+ <uid>user59</uid>
+ <password>user59</password>
+ <full-name>User 59</full-name>
+ <email>user59 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user60</short-name>
+ <uid>user60</uid>
+ <password>user60</password>
+ <full-name>User 60</full-name>
+ <email>user60 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user61</short-name>
+ <uid>user61</uid>
+ <password>user61</password>
+ <full-name>User 61</full-name>
+ <email>user61 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user62</short-name>
+ <uid>user62</uid>
+ <password>user62</password>
+ <full-name>User 62</full-name>
+ <email>user62 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user63</short-name>
+ <uid>user63</uid>
+ <password>user63</password>
+ <full-name>User 63</full-name>
+ <email>user63 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user64</short-name>
+ <uid>user64</uid>
+ <password>user64</password>
+ <full-name>User 64</full-name>
+ <email>user64 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user65</short-name>
+ <uid>user65</uid>
+ <password>user65</password>
+ <full-name>User 65</full-name>
+ <email>user65 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user66</short-name>
+ <uid>user66</uid>
+ <password>user66</password>
+ <full-name>User 66</full-name>
+ <email>user66 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user67</short-name>
+ <uid>user67</uid>
+ <password>user67</password>
+ <full-name>User 67</full-name>
+ <email>user67 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user68</short-name>
+ <uid>user68</uid>
+ <password>user68</password>
+ <full-name>User 68</full-name>
+ <email>user68 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user69</short-name>
+ <uid>user69</uid>
+ <password>user69</password>
+ <full-name>User 69</full-name>
+ <email>user69 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user70</short-name>
+ <uid>user70</uid>
+ <password>user70</password>
+ <full-name>User 70</full-name>
+ <email>user70 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user71</short-name>
+ <uid>user71</uid>
+ <password>user71</password>
+ <full-name>User 71</full-name>
+ <email>user71 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user72</short-name>
+ <uid>user72</uid>
+ <password>user72</password>
+ <full-name>User 72</full-name>
+ <email>user72 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user73</short-name>
+ <uid>user73</uid>
+ <password>user73</password>
+ <full-name>User 73</full-name>
+ <email>user73 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user74</short-name>
+ <uid>user74</uid>
+ <password>user74</password>
+ <full-name>User 74</full-name>
+ <email>user74 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user75</short-name>
+ <uid>user75</uid>
+ <password>user75</password>
+ <full-name>User 75</full-name>
+ <email>user75 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user76</short-name>
+ <uid>user76</uid>
+ <password>user76</password>
+ <full-name>User 76</full-name>
+ <email>user76 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user77</short-name>
+ <uid>user77</uid>
+ <password>user77</password>
+ <full-name>User 77</full-name>
+ <email>user77 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user78</short-name>
+ <uid>user78</uid>
+ <password>user78</password>
+ <full-name>User 78</full-name>
+ <email>user78 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user79</short-name>
+ <uid>user79</uid>
+ <password>user79</password>
+ <full-name>User 79</full-name>
+ <email>user79 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user80</short-name>
+ <uid>user80</uid>
+ <password>user80</password>
+ <full-name>User 80</full-name>
+ <email>user80 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user81</short-name>
+ <uid>user81</uid>
+ <password>user81</password>
+ <full-name>User 81</full-name>
+ <email>user81 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user82</short-name>
+ <uid>user82</uid>
+ <password>user82</password>
+ <full-name>User 82</full-name>
+ <email>user82 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user83</short-name>
+ <uid>user83</uid>
+ <password>user83</password>
+ <full-name>User 83</full-name>
+ <email>user83 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user84</short-name>
+ <uid>user84</uid>
+ <password>user84</password>
+ <full-name>User 84</full-name>
+ <email>user84 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user85</short-name>
+ <uid>user85</uid>
+ <password>user85</password>
+ <full-name>User 85</full-name>
+ <email>user85 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user86</short-name>
+ <uid>user86</uid>
+ <password>user86</password>
+ <full-name>User 86</full-name>
+ <email>user86 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user87</short-name>
+ <uid>user87</uid>
+ <password>user87</password>
+ <full-name>User 87</full-name>
+ <email>user87 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user88</short-name>
+ <uid>user88</uid>
+ <password>user88</password>
+ <full-name>User 88</full-name>
+ <email>user88 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user89</short-name>
+ <uid>user89</uid>
+ <password>user89</password>
+ <full-name>User 89</full-name>
+ <email>user89 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user90</short-name>
+ <uid>user90</uid>
+ <password>user90</password>
+ <full-name>User 90</full-name>
+ <email>user90 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user91</short-name>
+ <uid>user91</uid>
+ <password>user91</password>
+ <full-name>User 91</full-name>
+ <email>user91 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user92</short-name>
+ <uid>user92</uid>
+ <password>user92</password>
+ <full-name>User 92</full-name>
+ <email>user92 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user93</short-name>
+ <uid>user93</uid>
+ <password>user93</password>
+ <full-name>User 93</full-name>
+ <email>user93 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user94</short-name>
+ <uid>user94</uid>
+ <password>user94</password>
+ <full-name>User 94</full-name>
+ <email>user94 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user95</short-name>
+ <uid>user95</uid>
+ <password>user95</password>
+ <full-name>User 95</full-name>
+ <email>user95 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user96</short-name>
+ <uid>user96</uid>
+ <password>user96</password>
+ <full-name>User 96</full-name>
+ <email>user96 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user97</short-name>
+ <uid>user97</uid>
+ <password>user97</password>
+ <full-name>User 97</full-name>
+ <email>user97 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user98</short-name>
+ <uid>user98</uid>
+ <password>user98</password>
+ <full-name>User 98</full-name>
+ <email>user98 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user99</short-name>
+ <uid>user99</uid>
+ <password>user99</password>
+ <full-name>User 99</full-name>
+ <email>user99 at example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user100</short-name>
+ <uid>user100</uid>
+ <password>user100</password>
+ <full-name>User 100</full-name>
+ <email>user100 at example.com</email>
+</record>
+
+<record type="user">
<short-name>public01</short-name>
<uid>public01</uid>
<password>public01</password>
<full-name>Public 01</full-name>
<email>public01 at example.com</email>
- </record>
+</record>
- <record type="user">
+<record type="user">
<short-name>public02</short-name>
<uid>public02</uid>
<password>public02</password>
<full-name>Public 02</full-name>
- <email>public02 at example.com</email>
- </record>
+ <email>public02 at example.com</email>
+</record>
- <record type="user">
+<record type="user">
<short-name>public03</short-name>
<uid>public03</uid>
<password>public03</password>
<full-name>Public 03</full-name>
- <email>public03 at example.com</email>
- </record>
+ <email>public03 at example.com</email>
+</record>
- <record type="user">
+<record type="user">
<short-name>public04</short-name>
<uid>public04</uid>
<password>public04</password>
<full-name>Public 04</full-name>
- <email>public04 at example.com</email>
- </record>
+ <email>public04 at example.com</email>
+</record>
- <record type="user">
+<record type="user">
<short-name>public05</short-name>
<uid>public05</uid>
<password>public05</password>
<full-name>Public 05</full-name>
- <email>public05 at example.com</email>
- </record>
+ <email>public05 at example.com</email>
+</record>
- <record type="user">
+<record type="user">
<short-name>public06</short-name>
<uid>public06</uid>
<password>public06</password>
<full-name>Public 06</full-name>
- <email>public06 at example.com</email>
- </record>
+ <email>public06 at example.com</email>
+</record>
- <record type="user">
+<record type="user">
<short-name>public07</short-name>
<uid>public07</uid>
<password>public07</password>
<full-name>Public 07</full-name>
- <email>public07 at example.com</email>
- </record>
+ <email>public07 at example.com</email>
+</record>
- <record type="user">
+<record type="user">
<short-name>public08</short-name>
<uid>public08</uid>
<password>public08</password>
<full-name>Public 08</full-name>
- <email>public08 at example.com</email>
- </record>
+ <email>public08 at example.com</email>
+</record>
- <record type="user">
+<record type="user">
<short-name>public09</short-name>
<uid>public09</uid>
<password>public09</password>
<full-name>Public 09</full-name>
- <email>public09 at example.com</email>
- </record>
+ <email>public09 at example.com</email>
+</record>
- <record type="user">
+<record type="user">
<short-name>public10</short-name>
<uid>public10</uid>
<password>public10</password>
<full-name>Public 10</full-name>
- <email>public10 at example.com</email>
- </record>
+ <email>public10 at example.com</email>
+</record>
- <record type="group">
- <uid>group01</uid>
- <short-name>group01</short-name>
- <password>group01</password>
- <full-name>Group 01</full-name>
- <member-uid type="users">user01</member-uid>
- </record>
- <record type="group">
- <uid>group02</uid>
- <short-name>group02</short-name>
- <password>group02</password>
- <full-name>Group 02</full-name>
- <member-uid >user06</member-uid>
- <member-uid >user07</member-uid>
- </record>
- <record type="group">
- <uid>group03</uid>
- <short-name>group03</short-name>
- <password>group03</password>
- <full-name>Group 03</full-name>
- <member-uid type="users">user08</member-uid>
- <member-uid type="users">user09</member-uid>
- </record>
- <record type="group">
- <uid>group04</uid>
- <short-name>group04</short-name>
- <password>group04</password>
- <full-name>Group 04</full-name>
- <member-uid type="groups">group02</member-uid>
- <member-uid type="groups">group03</member-uid>
- <member-uid type="users">user10</member-uid>
- </record>
- <record type="group"> <!-- delegategroup -->
- <uid>group05</uid>
- <short-name>group05</short-name>
- <password>group05</password>
- <full-name>Group 05</full-name>
- <member-uid type="groups">group06</member-uid>
- <member-uid type="users">user20</member-uid>
- </record>
- <record type="group"> <!-- delegatesubgroup -->
- <uid>group06</uid>
- <short-name>group06</short-name>
- <password>group06</password>
- <full-name>Group 06</full-name>
- <member-uid type="users">user21</member-uid>
- </record>
- <record type="group"> <!-- readonlydelegategroup -->
- <uid>group07</uid>
- <short-name>group07</short-name>
- <password>group07</password>
- <full-name>Group 07</full-name>
- <member-uid type="users">user22</member-uid>
- <member-uid type="users">user23</member-uid>
- <member-uid type="users">user24</member-uid>
- </record>
- <record type="group">
- <uid>disabledgroup</uid>
- <short-name>disabledgroup</short-name>
- <password>disabledgroup</password>
- <full-name>Disabled Group</full-name>
- <member-uid type="users">user01</member-uid>
- </record>
</directory>
Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml 2014-03-31 18:22:48 UTC (rev 13057)
@@ -4,27 +4,23 @@
<augments>
<record>
<uid>Default</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record repeat="10">
<uid>location%02d</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule>true</auto-schedule>
</record>
<record repeat="3">
<uid>resource%02d</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule>true</auto-schedule>
</record>
<record>
<uid>resource04</uid>
- <enable>false</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -33,7 +29,6 @@
</record>
<record>
<uid>resource05</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule>true</auto-schedule>
@@ -41,7 +36,6 @@
</record>
<record>
<uid>resource06</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule>true</auto-schedule>
@@ -49,7 +43,6 @@
</record>
<record>
<uid>resource07</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule>true</auto-schedule>
@@ -57,7 +50,6 @@
</record>
<record>
<uid>resource08</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule>true</auto-schedule>
@@ -65,7 +57,6 @@
</record>
<record>
<uid>resource09</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule>true</auto-schedule>
@@ -73,7 +64,6 @@
</record>
<record>
<uid>resource10</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule>true</auto-schedule>
@@ -81,31 +71,20 @@
</record>
<record>
<uid>resource11</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule>true</auto-schedule>
<auto-schedule-mode>decline-always</auto-schedule-mode>
<auto-accept-group>group01</auto-accept-group>
</record>
- <record repeat="10">
- <uid>group%02d</uid>
- <enable>true</enable>
- </record>
<record>
- <uid>disabledgroup</uid>
- <enable>false</enable>
- </record>
- <record>
<uid>delegatedroom</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>false</enable-addressbook>
<auto-schedule>false</auto-schedule>
</record>
<record>
<uid>03DFF660-8BCC-4198-8588-DD77F776F518</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -113,7 +92,6 @@
</record>
<record>
<uid>80689D41-DAF8-4189-909C-DB017B271892</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -122,7 +100,6 @@
</record>
<record>
<uid>C38BEE7A-36EE-478C-9DCB-CBF4612AFE65</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -132,7 +109,6 @@
</record>
<record>
<uid>CCE95217-A57B-481A-AC3D-FEC9AB6CE3A9</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -140,7 +116,6 @@
</record>
<record>
<uid>0CE0BF31-5F9E-4801-A489-8C70CF287F5F</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -148,7 +123,6 @@
</record>
<record>
<uid>6F9EE33B-78F6-481B-9289-3D0812FF0D64</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -157,7 +131,6 @@
</record>
<record>
<uid>76E7ECA6-08BC-4AE7-930D-F2E7453993A5</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -166,7 +139,6 @@
</record>
<record>
<uid>63A2F949-2D8D-4C8D-B8A5-DCF2A94610F3</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -175,7 +147,6 @@
</record>
<record>
<uid>06E3BDCB-9C19-485A-B14E-F146A80ADDC6</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
@@ -184,7 +155,6 @@
</record>
<record>
<uid>4D66A20A-1437-437D-8069-2F14E8322234</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<enable-login>true</enable-login>
Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml 2014-03-31 18:22:48 UTC (rev 13057)
@@ -65,20 +65,20 @@
</record>
<record type="user">
- <short-name>example</short-name>
+ <short-name>purge1</short-name>
<uid>C76DB741-5A2A-4239-8112-10CF152AFCA4</uid>
<guid>C76DB741-5A2A-4239-8112-10CF152AFCA4</guid>
- <password>example</password>
- <full-name>Example</full-name>
- <email>example at example.com</email>
+ <password>purge1</password>
+ <full-name>purge1</full-name>
+ <email>purge1 at example.com</email>
</record>
<record type="user">
- <short-name>example2</short-name>
+ <short-name>purge2</short-name>
<uid>FFED7B62-2E08-496E-BD32-B2F95FFDDB6B</uid>
<guid>FFED7B62-2E08-496E-BD32-B2F95FFDDB6B</guid>
- <password>example2</password>
- <full-name>Example Two</full-name>
- <email>example2 at example.com</email>
+ <password>purge2</password>
+ <full-name>purge2</full-name>
+ <email>purge2 at example.com</email>
</record>
<record type="user">
<short-name>home1</short-name>
@@ -368,62 +368,43 @@
<member-uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</member-uid>
<member-uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</member-uid>
</record>
- <!--
- <location>
- <uid>mercury</uid>
- <uid>mercury</uid>
- <password>mercury</password>
- <name>Mercury Seven</name>
- <email-address>mercury at example.com</email-address>
- </location>
- <location>
- <uid>gemini</uid>
- <uid>gemini</uid>
- <password>gemini</password>
- <name>Gemini Twelve</name>
- <email-address>gemini at example.com</email-address>
- </location>
- <location>
- <uid>apollo</uid>
- <uid>apollo</uid>
- <password>apollo</password>
- <name>Apollo Eleven</name>
- <email-address>apollo at example.com</email-address>
- </location>
- <location>
- <uid>orion</uid>
- <uid>orion</uid>
- <password>orion</password>
- <name>Orion</name>
- <email-address>orion at example.com</email-address>
- </location>
- <resource>
- <uid>transporter</uid>
- <uid>transporter</uid>
- <password>transporter</password>
- <name>Mass Transporter</name>
- <email-address>transporter at example.com</email-address>
- </resource>
- <resource>
- <uid>ftlcpu</uid>
- <uid>ftlcpu</uid>
- <password>ftlcpu</password>
- <name>Faster-Than-Light Microprocessor</name>
- <email-address>ftlcpu at example.com</email-address>
- </resource>
- <resource>
- <uid>non_calendar_proxy</uid>
- <uid>non_calendar_proxy</uid>
- <password>non_calendar_proxy</password>
- <name>Non-calendar proxy</name>
- <email-address>non_calendar_proxy at example.com</email-address>
- </resource>
- <resource>
- <uid>disabled</uid>
- <uid>disabled</uid>
- <password>disabled</password>
- <name>Disabled Record</name>
- <email-address>disabled at example.com</email-address>
- </resource>
--->
+
+ <!-- Calverify test records -->
+
+ <record type="user">
+ <short-name>example1</short-name>
+ <uid>D46F3D71-04B7-43C2-A7B6-6F92F92E61D0</uid>
+ <guid>D46F3D71-04B7-43C2-A7B6-6F92F92E61D0</guid>
+ <password>example</password>
+ <full-name>Example User1</full-name>
+ <email>example1 at example.com</email>
+ </record>
+
+ <record type="user">
+ <short-name>example2</short-name>
+ <uid>47B16BB4-DB5F-4BF6-85FE-A7DA54230F92</uid>
+ <guid>47B16BB4-DB5F-4BF6-85FE-A7DA54230F92</guid>
+ <password>example</password>
+ <full-name>Example User2</full-name>
+ <email>example2 at example.com</email>
+ </record>
+
+ <record type="user">
+ <short-name>example3</short-name>
+ <uid>AC478592-7783-44D1-B2AE-52359B4E8415</uid>
+ <guid>AC478592-7783-44D1-B2AE-52359B4E8415</guid>
+ <password>example</password>
+ <full-name>Example User3</full-name>
+ <email>example3 at example.com</email>
+ </record>
+
+ <record type="user">
+ <short-name>example4</short-name>
+ <uid>A89E3A97-1658-4E45-A185-479F3E49D446</uid>
+ <guid>A89E3A97-1658-4E45-A185-479F3E49D446</guid>
+ <password>example</password>
+ <full-name>Example User4</full-name>
+ <email>example4 at example.com</email>
+ </record>
+
</directory>
Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml 2014-03-31 18:22:48 UTC (rev 13057)
@@ -22,14 +22,12 @@
<!--
<record>
<uid>Location-Default</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule-mode>automatic</auto-schedule-mode>
</record>
<record>
<uid>Resource-Default</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-schedule-mode>automatic</auto-schedule-mode>
@@ -38,177 +36,127 @@
<record>
<uid>D11F03A0-97EA-48AF-9A6C-FAC7F3975766</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
<uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<server-id>00001</server-id>
</record>
<record>
<uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<server-id>00002</server-id>
</record>
<record>
<uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
<uid>5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
<uid>543D28BA-F74F-4D5F-9243-B3E3A61171E5</uid>
- <enable>true</enable>
<enable-calendar>false</enable-calendar>
<enable-addressbook>false</enable-addressbook>
</record>
<record repeat="100">
<uid>user%02d</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
- <uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>admin</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>grunts</uid>
- <enable>true</enable>
- </record>
- <record>
<uid>right_coast</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
<uid>left_coast</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
- <uid>both_coasts</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>recursive1_coasts</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>recursive2_coasts</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>non_calendar_group</uid>
- <enable>true</enable>
- </record>
- <record>
<uid>mercury</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
<uid>gemini</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
<uid>apollo</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
<auto-accept-group>both_coasts</auto-accept-group>
</record>
<record>
<uid>orion</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
<uid>transporter</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
<uid>ftlcpu</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
<!--
<record>
<uid>non_calendar_proxy</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
-->
<record>
- <uid>disabled</uid>
- <enable>false</enable>
- </record>
- <record>
<uid>7423F94A-6B76-4A3A-815B-D52CFD77935D</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
</record>
<record>
<uid>8A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
</record>
<record>
<uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
</record>
<record>
<uid>9E1FFAC4-3CCD-45A1-8272-D161C92D2EEE</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
</record>
<record>
<uid>7678EC8A-A069-4E82-9066-7279C6718507</uid>
- <enable>true</enable>
<enable-addressbook>true</enable-addressbook>
</record>
<record>
<uid>FC465590-E9E9-4746-ACE8-6C756A49FE4D</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
</record>
<record>
<uid>EC465590-E9E9-4746-ACE8-6C756A49FE4D</uid>
- <enable>true</enable>
<enable-calendar>true</enable-calendar>
<enable-login>true</enable-login>
</record>
<record>
<uid>00599DAF-3E75-42DD-9DB7-52617E79943F</uid>
- <enable>true</enable>
<enable-calendar>false</enable-calendar>
<enable-login>false</enable-login>
</record>
+ <record>
+ <uid>75EA36BE-F71B-40F9-81F9-CF59BF40CA8F</uid>
+ <enable-calendar>true</enable-calendar>
+ <auto-schedule>true</auto-schedule>
+ </record>
+
</augments>
Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml 2014-03-31 18:22:48 UTC (rev 13057)
@@ -80,4 +80,12 @@
<short-name>sanchezoffice</short-name>
<full-name>Sanchez Office</full-name>
</record>
+ <record type="location">
+ <short-name>location01</short-name>
+ <uid>75EA36BE-F71B-40F9-81F9-CF59BF40CA8F</uid>
+ <guid>75EA36BE-F71B-40F9-81F9-CF59BF40CA8F</guid>
+ <password>location01</password>
+ <full-name>Room 01</full-name>
+ </record>
+
</directory>
Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-31 18:22:48 UTC (rev 13057)
@@ -352,23 +352,8 @@
)
- # For scheduling/freebusy
- # FIXME: doesn't this need to happen in the DPS?
- @inlineCallbacks
- def isProxyFor(self, other):
- for recordType in (
- txdav.who.delegates.RecordType.readDelegatorGroup,
- txdav.who.delegates.RecordType.writeDelegatorGroup,
- ):
- delegatorGroup = yield self.service.recordWithShortName(
- recordType, self.uid
- )
- if delegatorGroup:
- if other in (yield delegatorGroup.members()):
- returnValue(True)
-
# Test client:
Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py 2014-03-31 18:22:48 UTC (rev 13057)
@@ -19,7 +19,6 @@
from twext.python.log import Logger
from twext.who.expression import MatchType, MatchFlags, Operand
-from twext.who.idirectory import RecordType
from twisted.application import service
from twisted.application.strports import service as strPortsService
from twisted.internet.defer import inlineCallbacks, returnValue
Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py 2014-03-31 18:22:48 UTC (rev 13057)
@@ -357,7 +357,7 @@
records = (yield self.client.recordsWithRecordType(
RecordType.user
))
- self.assertEquals(len(records), 31)
+ self.assertEquals(len(records), 35)
@inlineCallbacks
Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-31 18:22:48 UTC (rev 13057)
@@ -30,6 +30,7 @@
from txdav.who.idirectory import (
RecordType as DAVRecordType, AutoScheduleMode
)
+from txdav.who.delegates import RecordType as DelegateRecordType
from txweb2.auth.digest import DigestedCredentials
log = Logger()
@@ -64,8 +65,12 @@
address = normalizeCUAddr(address)
record = None
if address.startswith("urn:uuid:"):
- guid = address[9:]
- record = yield self.recordWithGUID(uuid.UUID(guid))
+ try:
+ guid = uuid.UUID(address[9:])
+ except ValueError:
+ log.info("Invalid GUID: {guid}", guid=address[9:])
+ returnValue(None)
+ record = yield self.recordWithGUID(guid)
elif address.startswith("mailto:"):
records = yield self.recordsWithEmailAddress(address[7:])
if records:
@@ -201,6 +206,10 @@
class CalendarDirectoryRecordMixin(object):
+ """
+ Calendar (and Contacts) specific logic for directory records lives in this
+ class
+ """
@inlineCallbacks
@@ -364,7 +373,7 @@
return False
- #MOVE2WHO
+ # FIXME:
def thisServer(self):
return True
@@ -444,3 +453,18 @@
yield member.expandedMembers(members)
returnValue(members)
+
+
+ # For scheduling/freebusy
+ @inlineCallbacks
+ def isProxyFor(self, other):
+ for recordType in (
+ DelegateRecordType.readDelegatorGroup,
+ DelegateRecordType.writeDelegatorGroup,
+ ):
+ delegatorGroup = yield self.service.recordWithShortName(
+ recordType, self.uid
+ )
+ if delegatorGroup:
+ if other in (yield delegatorGroup.members()):
+ returnValue(True)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140331/c493f5cb/attachment-0001.html>
More information about the calendarserver-changes
mailing list