Revision

1584

Author

dreid@apple.com

Date

2007-06-05 11:35:27 -0700 (Tue, 05 Jun 2007)

Log Message

Fix the test_config tests, and remove a pdb.set_trace()

Modified Paths

• CalendarServer/trunk/twistedcaldav/cluster.py
• CalendarServer/trunk/twistedcaldav/test/test_config.py

Diff

--- CalendarServer/trunk/twistedcaldav/cluster.py	2007-06-05 17:44:55 UTC (rev 1583)
+++ CalendarServer/trunk/twistedcaldav/cluster.py	2007-06-05 18:35:27 UTC (rev 1584)
@@ -85,8 +85,6 @@
         if config.GroupName:
             args.extend(('-g', config.GroupName))
 
-        import pdb; pdb.set_trace()
-
         args.extend(
             ['-n', self.tapname,
              '-f', self.configFile,

--- CalendarServer/trunk/twistedcaldav/test/test_config.py	2007-06-05 17:44:55 UTC (rev 1583)
+++ CalendarServer/trunk/twistedcaldav/test/test_config.py	2007-06-05 18:35:27 UTC (rev 1584)
@@ -71,7 +71,7 @@
         _testVerbose(self)
 
     def testReloading(self):
-        self.assertEquals(config.HTTPPort, -1)
+        self.assertEquals(config.HTTPPort, 0)
 
         config.loadConfig(self.testConfig)
 
@@ -81,10 +81,10 @@
 
         config.reload()
 
-        self.assertEquals(config.HTTPPort, -1)
+        self.assertEquals(config.HTTPPort, 0)
 
     def testUpdateAndReload(self):
-        self.assertEquals(config.HTTPPort, -1)
+        self.assertEquals(config.HTTPPort, 0)
 
         config.loadConfig(self.testConfig)
 
@@ -108,7 +108,7 @@
         self.assertEquals(config.BindAddresses, ['127.0.0.1'])
 
     def testUpdating(self):
-        self.assertEquals(config.SSLPort, -1)
+        self.assertEquals(config.SSLPort, 0)
 
         config.update({'SSLPort': 8443})
 
@@ -181,7 +181,7 @@
     testDirectoryService_unknownType.todo = "unimplemented"
 
     def testUpdateDefaults(self):
-        self.assertEquals(config.SSLPort, -1)
+        self.assertEquals(config.SSLPort, 0)
 
         config.loadConfig(self.testConfig)
 
@@ -193,7 +193,7 @@
 
         self.assertEquals(config.SSLPort, 8009)
 
-        config.updateDefaults({'SSLPort': -1})
+        config.updateDefaults({'SSLPort': 0})
 
     def testMergeDefaults(self):
         config.updateDefaults({'MultiProcess': {}})
@@ -207,7 +207,7 @@
 
         config.reload()
 
-        self.assertEquals(config.SSLPort, -1)
+        self.assertEquals(config.SSLPort, 0)
 
     def testCopiesDefaults(self):
         config.updateDefaults({'Foo': 'bar'})