[CalendarServer-changes] [6052] CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/ test_collectioncontents.py

[source_changes at macosforge.org]

Revision: 6052
          http://trac.macosforge.org/projects/calendarserver/changeset/6052
Author:   glyph at apple.com
Date:     2010-08-11 09:48:09 -0700 (Wed, 11 Aug 2010)
Log Message:
-----------
correct the obvious test bugs (although something is still wrong)

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/test_collectioncontents.py

Modified: CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/test_collectioncontents.py
===================================================================
--- CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/test_collectioncontents.py	2010-08-11 16:37:52 UTC (rev 6051)
+++ CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/test_collectioncontents.py	2010-08-11 16:48:09 UTC (rev 6052)
@@ -58,7 +58,7 @@
         # Tests in this suite assume that the root resource is a calendar home.
         # FIXME: there should be a centralized way of saying 'make this look
         # like a calendar home'
-        super(CollectionContents, self).setUp()
+        return super(CollectionContents, self).setUp()
 
 
     def test_collection_in_calendar(self):
@@ -166,9 +166,7 @@
         with the data from given stream and verifies that the response code from the
         PUT request matches the given response_code.
         """
-        calendar_path, calendar_uri = self.mkdtemp("calendar")
-        calPath = FilePath(calendar_path)
-        calPath.remove()
+        ignored, calendar_uri = self.mkdtemp("calendar")
 
         def mkcalendar_cb(response):
             response = IResponse(response)
@@ -205,9 +203,7 @@
         """
         Make (regular) collection in calendar
         """
-        calendar_path, calendar_uri = self.mkdtemp("dot_file_in_calendar")
-        calPath = FilePath(calendar_path)
-        calPath.remove()
+        ignored, calendar_uri = self.mkdtemp("dot_file_in_calendar")
 
         def mkcalendar_cb(response):
             response = IResponse(response)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100811/e7bcb148/attachment.html>