summaryrefslogtreecommitdiff
path: root/Lib/unittest/test/test_loader.py
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2014-11-05 03:09:01 +1300
committerRobert Collins <rbtcollins@hp.com>2014-11-05 03:09:01 +1300
commitbf2bda3c9704181cebb6163f5eacd5ad4e1c15f4 (patch)
tree1f2e15056fc7e7bd965dd5b043183bc575d28f62 /Lib/unittest/test/test_loader.py
parentd39e199a0d49504583c5672252f653fc01837e32 (diff)
downloadcpython-git-bf2bda3c9704181cebb6163f5eacd5ad4e1c15f4.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.py2
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(