[CalendarServer-changes] [5624] CalDAVTester/trunk/odsetup.py

[source_changes at macosforge.org]

Revision: 5624
          http://trac.macosforge.org/projects/calendarserver/changeset/5624
Author:   cdaboo at apple.com
Date:     2010-05-19 13:29:28 -0700 (Wed, 19 May 2010)
Log Message:
-----------
Fix ServerRoot handling. Add some address attributes so we can test VCard ADR fields.

Modified Paths:
--------------
    CalDAVTester/trunk/odsetup.py

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2010-05-19 20:28:39 UTC (rev 5623)
+++ CalDAVTester/trunk/odsetup.py	2010-05-19 20:29:28 UTC (rev 5624)
@@ -90,6 +90,11 @@
     "dsAttrTypeStandard:FirstName":       "Public",
     "dsAttrTypeStandard:LastName":        "%02d",
     "dsAttrTypeStandard:EMailAddress":    "public%02d at example.com",
+    "dsAttrTypeStandard:Street":          "%d Public Row",
+    "dsAttrTypeStandard:City":            "Exampleville",
+    "dsAttrTypeStandard:State":           "Testshire",
+    "dsAttrTypeStandard:PostalCode":      "RFC 4791",
+    "dsAttrTypeStandard:Country":         "AAA",
 }
 
 locationcreatecmd = """<?xml version="1.0" encoding="UTF-8"?>
@@ -260,9 +265,13 @@
 
     plist = readPlist(config)
     hostname = plist["ServerHostName"]
+
+    serverroot = plist["ServerRoot"]
     docroot = plist["DocumentRoot"]
+    docroot = os.path.join(serverroot, docroot) if docroot and docroot[0] not in ('/', '.',) else docroot
+
     sudoers = plist["SudoersFile"]
-    
+
     try:
         basic_ok = plist["Authentication"]["Basic"]["Enabled"]
     except KeyError:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100519/e319b0da/attachment.html>