[minion-cvs] Check server descriptors against configuration files, r...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv11789/lib/mixminion

Modified Files:
	test.py 
Log Message:
Check server descriptors against configuration files, regenerate as needed.

Avoid potentially confusing messages about 'published' descriptors that 
aren't really published.

Catch ConfigError from unrecognized descriptor versions and suggest
'server-upgrade'.



Index: test.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/test.py,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- test.py	26 May 2003 20:04:22 -0000	1.108
+++ test.py	27 May 2003 17:24:49 -0000	1.109
@@ -3864,6 +3864,12 @@
 Enabled: yes
 ReturnAddress: X@Y.Z
 """)
+            conf2 =  mixminion.server.ServerConfig.ServerConfig(
+                string=(SERVER_CONFIG_SHORT%mix_mktemp())+
+                                           """[Incoming/MMTP]
+Enabled: yes
+IP: 192.168.100.4
+""")
         finally:
             resumeLog()
 
@@ -3883,6 +3889,10 @@
                           key2.getPacketKey().get_public_key())
         eq(info3['Incoming/MMTP']['IP'], "192.168.100.3")
         self.assert_('smtp' in info3.getCaps())
+
+        key3.regenerateServerDescriptor(conf2, identity)
+        info3 = key3.getServerDescriptor()
+        eq(info3['Incoming/MMTP']['IP'], "192.168.100.4")
 
     def test_directory(self):
         eq = self.assertEquals