From 809726954c62740ae8a660e24c41fd1b078f8cd5 Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Sat, 26 Jun 2010 00:17:12 +0000
Subject: [PATCH] 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.
........
---
 Lib/test/test_optparse.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py
index 8486c79e8a9..1b43f9ad2f3 100644
--- a/Lib/test/test_optparse.py
+++ b/Lib/test/test_optparse.py
@@ -754,6 +754,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",