From: R. David Murray <rdmurray@bitdance.com>
Date: Sat, 26 Jun 2010 00:20:20 +0000 (+0000)
Subject: Merged revisions 82234 via svnmerge from
X-Git-Tag: v3.1.3rc1~590
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5b2dcf2b20190e3812fff8f82ca30fc77edb8fc;p=python

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 cdbbc9d549..3601c54a2f 100644
--- 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",