[CalendarServer-changes] [3379] CalendarServer/trunk/twistedcaldav/test/test_mail.py

[source_changes at macosforge.org]

Revision: 3379
          http://trac.macosforge.org/projects/calendarserver/changeset/3379
Author:   cdaboo at apple.com
Date:     2008-11-13 13:19:35 -0800 (Thu, 13 Nov 2008)
Log Message:
-----------
Don't test for icons if the main path is not present.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/test/test_mail.py

Modified: CalendarServer/trunk/twistedcaldav/test/test_mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_mail.py	2008-11-13 21:11:56 UTC (rev 3378)
+++ CalendarServer/trunk/twistedcaldav/test/test_mail.py	2008-11-13 21:19:35 UTC (rev 3379)
@@ -33,10 +33,11 @@
     def test_iconPath(self):
         iconPath = self.handler.getIconPath({'day':'1', 'month':'1'}, False, language='en')
         iconDir = "/usr/share/caldavd/share/date_icons"
-        if os.path.exists("%s/JAN/01.png" % (iconDir,)):
-            self.assertEquals(iconPath, "%s/JAN/01.png" % (iconDir,))
-        else:
-            self.assertEquals(iconPath, "%s/01/01.png" % (iconDir,))
+        if os.path.exists(iconDir):
+            if os.path.exists("%s/JAN/01.png" % (iconDir,)):
+                self.assertEquals(iconPath, "%s/JAN/01.png" % (iconDir,))
+            else:
+                self.assertEquals(iconPath, "%s/01/01.png" % (iconDir,))
 
     def test_checkDSNFailure(self):
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081113/184fb5aa/attachment.html>