diff options
author | Robert Collins <rbtcollins@hp.com> | 2014-11-05 03:09:01 +1300 |
---|---|---|
committer | Robert Collins <rbtcollins@hp.com> | 2014-11-05 03:09:01 +1300 |
commit | 05284b4d4c6b50df1a889a26a24c847707d20804 (patch) | |
tree | 8e43885b2fa562501ce84327e767459cdeb99470 /Lib/unittest/test/test_loader.py | |
parent | dd228651e3a44907fdb6d9c487a6394c48dbfe34 (diff) | |
download | cpython-05284b4d4c6b50df1a889a26a24c847707d20804.tar.gz |
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.
Diffstat (limited to 'Lib/unittest/test/test_loader.py')
-rw-r--r-- | Lib/unittest/test/test_loader.py | 2 |
1 files changed, 1 insertions, 1 deletions
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( |