Revision: 787 http://trac.macosforge.org/projects/calendarserver/changeset/787 Author: wsanchez@apple.com Date: 2006-12-08 23:12:23 -0800 (Fri, 08 Dec 2006) Log Message: ----------- Fix/tests Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/admin/script.py CalendarServer/trunk/twistedcaldav/config.py CalendarServer/trunk/twistedcaldav/test/test_config.py Modified: CalendarServer/trunk/twistedcaldav/admin/script.py =================================================================== --- CalendarServer/trunk/twistedcaldav/admin/script.py 2006-12-09 07:00:50 UTC (rev 786) +++ CalendarServer/trunk/twistedcaldav/admin/script.py 2006-12-09 07:12:23 UTC (rev 787) @@ -36,7 +36,7 @@ from twistedcaldav.admin import options from twistedcaldav.admin import formatters -from twistedcaldav.config import config +from twistedcaldav.config import config, parseConfig class AdminOptions(usage.Options): recursing = 0 @@ -83,7 +83,7 @@ if self['config']: self['config'] = os.path.abspath(self['config']) if os.path.exists(self['config']): - config.parseConfig(self['config']) + parseConfig(self['config']) self.root = filepath.FilePath(config.DocumentRoot) self.calendarCollection = self.root.child('calendars') Modified: CalendarServer/trunk/twistedcaldav/config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/config.py 2006-12-09 07:00:50 UTC (rev 786) +++ CalendarServer/trunk/twistedcaldav/config.py 2006-12-09 07:12:23 UTC (rev 787) @@ -22,7 +22,7 @@ defaultConfigFile = '/etc/caldavd/caldavd.plist' -defaults = { +defaultConfig = { 'CreateAccounts': False, 'DirectoryService': { 'params': {'node': '/Search'}, @@ -62,12 +62,11 @@ self.update(defaults) def update(self, items): - if type(items) is dict: - items = items.iteritems() + items = items.iteritems() for key, value in items: setattr(self, key, value) -config = Config(defaults) +config = Config(defaultConfig) def parseConfig(configFile): if os.path.exists(configFile): Modified: CalendarServer/trunk/twistedcaldav/test/test_config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/test/test_config.py 2006-12-09 07:00:50 UTC (rev 786) +++ CalendarServer/trunk/twistedcaldav/test/test_config.py 2006-12-09 07:12:23 UTC (rev 787) @@ -18,7 +18,7 @@ from twisted.trial import unittest -from twistedcaldav.config import config +from twistedcaldav.config import config, defaultConfig, parseConfig testConfig = """<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> @@ -32,19 +32,19 @@ class ConfigTests(unittest.TestCase): def setUp(self): - reload(config) + config.update(defaultConfig) self.testConfig = self.mktemp() open(self.testConfig, 'w').write(testConfig) def testDefaults(self): - for key, value in config.defaults.iteritems(): + for key, value in defaultConfig.iteritems(): self.failUnless(key in config.__dict__) self.assertEquals(config.__dict__[key], value) def testParseConfig(self): self.assertEquals(config.Verbose, False) - config.parseConfig(self.testConfig) + parseConfig(self.testConfig) self.assertEquals(config.Verbose, True) @@ -54,7 +54,7 @@ self.assertEquals(config.Verbose, False) - config.parseConfig(self.testConfig) + parseConfig(self.testConfig) self.assertEquals(config.Verbose, True)