[CalendarServer-changes] [6620] CalDAVTester/trunk/src/caldavtest.py

[source_changes at macosforge.org]

Revision: 6620
          http://trac.macosforge.org/projects/calendarserver/changeset/6620
Author:   cdaboo at apple.com
Date:     2010-11-11 11:23:04 -0800 (Thu, 11 Nov 2010)
Log Message:
-----------
Handle case where postgres.log does not yet exist on first test.

Modified Paths:
--------------
    CalDAVTester/trunk/src/caldavtest.py

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2010-11-11 19:21:40 UTC (rev 6619)
+++ CalDAVTester/trunk/src/caldavtest.py	2010-11-11 19:23:04 UTC (rev 6620)
@@ -27,6 +27,7 @@
 from src.testsuite import testsuite
 from xml.etree.ElementTree import ElementTree, tostring
 import commands
+import os
 import rfc822
 import socket
 import src.xmlDefs
@@ -675,12 +676,16 @@
         Initialize postgres statement counter
         """
         if self.manager.postgresLog:
-            return int(commands.getoutput("grep \"LOG:  statement:\" %s | wc -l" % (self.manager.postgresLog,)))
-        else:
-            return 0
+            if os.path.exists(self.manager.postgresLog):
+                return int(commands.getoutput("grep \"LOG:  statement:\" %s | wc -l" % (self.manager.postgresLog,)))
+
+        return 0
         
     def postgresResult(self, startCount, indent):
         
         if self.manager.postgresLog:
-            newCount = int(commands.getoutput("grep \"LOG:  statement:\" %s | wc -l" % (self.manager.postgresLog,)))
-            self.manager.log(manager.LOG_HIGH, "Postgres Stataments: %d" % (newCount - startCount,), indent=indent)
+            if os.path.exists(self.manager.postgresLog):
+                newCount = int(commands.getoutput("grep \"LOG:  statement:\" %s | wc -l" % (self.manager.postgresLog,)))
+            else:
+                newCount = 0
+            self.manager.log(manager.LOG_HIGH, "Postgres Statements: %d" % (newCount - startCount,), indent=indent)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101111/7f2c7ead/attachment.html>