diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/unittest/main.py | 5 | ||||
| -rw-r--r-- | Lib/unittest/test/test_discovery.py | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py index 55d4e4b..d09bccd 100644 --- a/Lib/unittest/main.py +++ b/Lib/unittest/main.py @@ -197,7 +197,10 @@ class TestProgram(object): self.test = self.testLoader.loadTestsFromNames(self.testNames, self.module) - def _do_discovery(self, argv, Loader=loader.TestLoader): + def _do_discovery(self, argv, Loader=None): + if Loader is None: + Loader = self.testLoader + # handle command line args for test discovery self.progName = '%s discover' % self.progName import optparse diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py index e688f8e..eba269f 100644 --- a/Lib/unittest/test/test_discovery.py +++ b/Lib/unittest/test/test_discovery.py @@ -253,12 +253,26 @@ class TestDiscovery(unittest.TestCase): program = TestableTestProgram() program.usageExit = usageExit + program.testLoader = None with self.assertRaises(Stop): # too many args program._do_discovery(['one', 'two', 'three', 'four']) + def test_command_line_handling_do_discovery_uses_default_loader(self): + program = object.__new__(unittest.TestProgram) + + class Loader(object): + args = [] + def discover(self, start_dir, pattern, top_level_dir): + self.args.append((start_dir, pattern, top_level_dir)) + return 'tests' + + program.testLoader = Loader + program._do_discovery(['-v']) + self.assertEqual(Loader.args, [('.', 'test*.py', None)]) + def test_command_line_handling_do_discovery_calls_loader(self): program = TestableTestProgram() |