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.
  ........
................

diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py
index cdbbc9d54915416194c644fbd3c8647c7f0a0164..3601c54a2f306c545e29cac86e5e04e851651744 100644 (file)
--- a/Lib/test/test_optparse.py
+++ b/Lib/test/test_optparse.py
@@ -756,6 +756,11 @@ class TestStandard(BaseTest):
                            {'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",