From 20054477f4671150e098b519dc1b85d7db6d27ab Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Sat, 23 Feb 2013 18:52:51 +0100
Subject: [PATCH] Issue #15132: Allow a list for the defaultTest argument of
 unittest.TestProgram

Patch by Jyrki Pulliainen
---
 Lib/unittest/main.py              |  5 ++++-
 Lib/unittest/test/test_program.py | 35 +++++++++++++++++++++++++++++++
 Misc/NEWS                         |  3 +++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index ead64936a0b..edb141ac915 100644
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -164,7 +164,10 @@ def parseArgs(self, argv):
                 # to support python -m unittest ...
                 self.module = None
         else:
-            self.testNames = (self.defaultTest,)
+            if isinstance(self.defaultTest, str):
+                self.testNames = (self.defaultTest,)
+            else:
+                self.testNames = list(self.defaultTest)
         self.createTests()
 
     def createTests(self):
diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py
index 9794868f6d5..8e02f3cf149 100644
--- a/Lib/unittest/test/test_program.py
+++ b/Lib/unittest/test/test_program.py
@@ -64,6 +64,41 @@ def loadTestsFromModule(self, module):
             return self.suiteClass(
                 [self.loadTestsFromTestCase(Test_TestProgram.FooBar)])
 
+        def loadTestsFromNames(self, names, module):
+            return self.suiteClass(
+                [self.loadTestsFromTestCase(Test_TestProgram.FooBar)])
+
+    def test_defaultTest_with_string(self):
+        class FakeRunner(object):
+            def run(self, test):
+                self.test = test
+                return True
+
+        old_argv = sys.argv
+        sys.argv = ['faketest']
+        runner = FakeRunner()
+        program = unittest.TestProgram(testRunner=runner, exit=False,
+                                       defaultTest='unittest.test',
+                                       testLoader=self.FooBarLoader())
+        sys.argv = old_argv
+        self.assertEquals(('unittest.test',), program.testNames)
+
+    def test_defaultTest_with_iterable(self):
+        class FakeRunner(object):
+            def run(self, test):
+                self.test = test
+                return True
+
+        old_argv = sys.argv
+        sys.argv = ['faketest']
+        runner = FakeRunner()
+        program = unittest.TestProgram(
+            testRunner=runner, exit=False,
+            defaultTest=['unittest.test', 'unittest.test2'],
+            testLoader=self.FooBarLoader())
+        sys.argv = old_argv
+        self.assertEquals(['unittest.test', 'unittest.test2'],
+                          program.testNames)
 
     def test_NonExit(self):
         program = unittest.main(exit=False,
diff --git a/Misc/NEWS b/Misc/NEWS
index a2777cede5b..e048d6d5cc6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -260,6 +260,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #15132: Allow a list for the defaultTest argument of
+  unittest.TestProgram. Patch by Jyrki Pulliainen.
+
 - Issue #17225: JSON decoder now counts columns in the first line starting
   with 1, as in other lines.