From bf2bda3c9704181cebb6163f5eacd5ad4e1c15f4 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Wed, 5 Nov 2014 03:09:01 +1300 Subject: Close #22457: Honour load_tests in the start_dir of discovery. We were not honouring load_tests in a package/__init__.py when that was the start_dir parameter, though we do when it is a child package. The fix required a little care since it introduces the possibility of infinite recursion. --- Lib/unittest/test/test_loader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/unittest/test/test_loader.py') diff --git a/Lib/unittest/test/test_loader.py b/Lib/unittest/test/test_loader.py index c489730232..68f1036111 100644 --- a/Lib/unittest/test/test_loader.py +++ b/Lib/unittest/test/test_loader.py @@ -841,7 +841,7 @@ class Test_TestLoader(unittest.TestCase): loader = unittest.TestLoader() suite = loader.loadTestsFromNames( - ['unittest.loader.sdasfasfasdf', 'unittest']) + ['unittest.loader.sdasfasfasdf', 'unittest.test.dummy']) error, test = self.check_deferred_error(loader, list(suite)[0]) expected = "module 'unittest.loader' has no attribute 'sdasfasfasdf'" self.assertIn( -- cgit v1.2.1