[CalendarServer-changes] [14642] CalendarServer/trunk/calendarserver/tap/test/test_caldav.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Apr 1 10:42:46 PDT 2015


Revision: 14642
          http://trac.calendarserver.org//changeset/14642
Author:   dre at apple.com
Date:     2015-04-01 10:42:45 -0700 (Wed, 01 Apr 2015)
Log Message:
-----------
Turns out it's easy to allow the deferred machinery to handle cleanup in tearDown(). Also don't delete the socket file because we didn't create it.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/test/test_caldav.py

Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2015-03-31 22:19:14 UTC (rev 14641)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2015-04-01 17:42:45 UTC (rev 14642)
@@ -490,13 +490,9 @@
 
     def tearDown(self):
         """
-        Verify that our spawned memcached can be reaped in no more than
-        one second - if not we'll get reactor unclean failures.
+        Verify that our spawned memcached can be reaped.
         """
-        self.monitor.stopService()
-        sleep(1)
-        if os.path.exists(self.socket):
-            os.remove(self.socket)
+        return self.monitor.stopService()
 
 
 class ProcessMonitorTests(CalDAVServiceMakerTestBase):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150401/7e6f20a8/attachment.html>


More information about the calendarserver-changes mailing list