[CalendarServer-changes] [15017] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 15017
          http://trac.calendarserver.org//changeset/15017
Author:   cdaboo at apple.com
Date:     2015-07-31 09:46:12 -0700 (Fri, 31 Jul 2015)
Log Message:
-----------
Minor clean-up.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/twistedcaldav/memcacheclient.py
    CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2015-07-29 21:21:59 UTC (rev 15016)
+++ CalendarServer/trunk/requirements-stable.txt	2015-07-31 16:46:12 UTC (rev 15017)
@@ -70,7 +70,7 @@
 
     --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@14915#egg=pycalendar
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@15000#egg=pycalendar
     python-dateutil==1.5  # Note: v2.0+ is for Python 3
     pytz==2015.4
 

Modified: CalendarServer/trunk/twistedcaldav/memcacheclient.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/memcacheclient.py	2015-07-29 21:21:59 UTC (rev 15016)
+++ CalendarServer/trunk/twistedcaldav/memcacheclient.py	2015-07-31 16:46:12 UTC (rev 15017)
@@ -776,7 +776,7 @@
         check_key(key)
         server, key = self._get_server(key)
         if not server:
-            return 0
+            raise MemcacheError("Memcache connection error")
 
         self._statlog(cmd)
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2015-07-29 21:21:59 UTC (rev 15016)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2015-07-31 16:46:12 UTC (rev 15017)
@@ -197,7 +197,7 @@
         toHome = yield self.transactionUnderTest().calendarHomeWithUID(
             "new-home", create=True)
         toCalendar = yield toHome.calendarWithName("calendar")
-        ok, bad = (yield _migrateCalendar(fromCalendar, toCalendar, lambda x: x.component()))
+        ok, bad = (yield _migrateCalendar(fromCalendar, toCalendar, lambda x: succeed(x.component())))
         self.assertEqual(ok, 1)
         self.assertEqual(bad, 2)
 
@@ -4814,7 +4814,8 @@
         yield self.abort()
 
         # Wait for it to complete
-        yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
+        result = yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
+        self.assertTrue(result)
 
         rows = yield Select(
             [w.RESOURCE_ID, ],
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150731/9922f0c4/attachment.html>