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

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

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

Modified Files:
      Tag: new-config-branch
	test_options.py 
Log Message:
- make sure the usage-errors actually generated help text
- add tests for explicit requests for help


Index: test_options.py
===================================================================
RCS file: /cvsroot/cvs-syncmail/syncmail/tests/Attic/test_options.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- test_options.py	11 Jul 2003 12:19:29 -0000	1.1.2.3
+++ test_options.py	11 Jul 2003 12:27:18 -0000	1.1.2.4
@@ -3,6 +3,7 @@
 # These tests assume that the syncmail script is in the current directory.
 
 import os
+import string
 import sys
 import unittest
 
@@ -99,8 +100,9 @@
 class UsageErrorTests(unittest.TestCase):
 
     def setUp(self):
-        sys.stderr = StringIO()
-        sys.stdout = sys.stderr
+        self.sio = StringIO()
+        sys.stderr = self.sio
+        sys.stdout = self.sio
 
     def tearDown(self):
         sys.stderr = sys.__stderr__
@@ -109,14 +111,27 @@
     def test_simple_option_twice(self):
         self.assertRaises(SystemExit, syncmail.load_cmdline,
                           ['-qq'])
+        self.failUnless(string.strip(self.sio.getvalue()))
 
     def test_competing_options(self):
         self.assertRaises(SystemExit, syncmail.load_cmdline,
                           ['--config=filename', '--no-config'])
+        self.failUnless(string.strip(self.sio.getvalue()))
 
     def test_double_negation(self):
         self.assertRaises(SystemExit, syncmail.load_cmdline,
                           ['--no-config', '--no-config'])
+        self.failUnless(string.strip(self.sio.getvalue()))
+
+    def test_dash_h(self):
+        self.assertRaises(SystemExit, syncmail.load_cmdline,
+                          ['-h'])
+        self.failUnless(string.strip(self.sio.getvalue()))
+
+    def test_dash_dash_help(self):
+        self.assertRaises(SystemExit, syncmail.load_cmdline,
+                          ['--help'])
+        self.failUnless(string.strip(self.sio.getvalue()))
 
 
 def test_suite():