[Python-checkins] r82235 - in python/branches/release31-maint: Lib/test/test_optparse.py

[r.david.murray]

Author: r.david.murray
Date: Sat Jun 26 02:20:20 2010
New Revision: 82235

Log:
Merged revisions 82234 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82234 | r.david.murray | 2010-06-25 20:17:12 -0400 (Fri, 25 Jun 2010) | 9 lines
  
  Merged revisions 82233 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r82233 | r.david.murray | 2010-06-25 20:06:44 -0400 (Fri, 25 Jun 2010) | 2 lines
    
    #4640: add a test to optparse that proves issue is invalid.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_optparse.py

Modified: python/branches/release31-maint/Lib/test/test_optparse.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_optparse.py	(original)
+++ python/branches/release31-maint/Lib/test/test_optparse.py	Sat Jun 26 02:20:20 2010
@@ -756,6 +756,11 @@
                            {'a': "-b3", 'boo': None, 'foo': None},
                            [])
 
+    def test_combined_single_invalid_option(self):
+        self.parser.add_option("-t", action="store_true")
+        self.assertParseFail(["-test"],
+                          "no such option: -e")
+
 class TestBool(BaseTest):
     def setUp(self):
         options = [make_option("-v",