[Cvs-syncmail] syncmail/tests test_options.py,1.1.2.4,1.1.2.5

[Fred L. D. <fd...@us...>]

Update of /cvsroot/cvs-syncmail/syncmail/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv14964/tests

Modified Files:
      Tag: new-config-branch
	test_options.py 
Log Message:
Merge in many changes and refactorings based on the development of branchctl.

Index: test_options.py
===================================================================
RCS file: /cvsroot/cvs-syncmail/syncmail/tests/Attic/test_options.py,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- test_options.py	11 Jul 2003 12:27:18 -0000	1.1.2.4
+++ test_options.py	14 Jul 2003 17:01:32 -0000	1.1.2.5
@@ -73,7 +73,7 @@
         self.assertEqual(args, [])
 
     def test_load_configuration_empty(self):
-        config = syncmail.load_configuration([])
+        config = syncmail.load_configuration([]).get_config()
         self.assertEqual(config.contextlines, 2)
         self.assertEqual(config.verbose, 1)
         self.assertEqual(config.smtp_server, syncmail.MAILHOST)
@@ -81,18 +81,18 @@
 
     def test_load_configuration_simple(self):
         config = syncmail.load_configuration(
-            ['-q', '--mailhost=smtp.example.com'])
+            ['-q', '--mailhost=smtp.example.com']).get_config()
         self.assertEqual(config.verbose, 0)
         self.assertEqual(config.smtp_server, "smtp.example.com")
         self.assertEqual(config.smtp_port, syncmail.MAILPORT)
 
     def test_load_configuration_smtp_address(self):
         config = syncmail.load_configuration(
-            ['--mailhost=smtp.example.com:8025'])
+            ['--mailhost=smtp.example.com:8025']).get_config()
         self.assertEqual(config.smtp_server, "smtp.example.com")
         self.assertEqual(config.smtp_port, 8025)
 
-        config = syncmail.load_configuration(['--mailhost=:8025'])
+        config = syncmail.load_configuration(['--mailhost=:8025']).get_config()
         self.assertEqual(config.smtp_server, syncmail.MAILHOST)
         self.assertEqual(config.smtp_port, 8025)