From bacc272afc165df21c607aae4ff7bfa21ae1979d Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 5 Dec 2018 12:04:57 -0800 Subject: bpo-34185: Fix test module collision in test_bdb when ran as script. (GH-8537) When running test_bdb.py as a script, `import test_module` would be importing the existing Lib/test/test_modules.py instead of the tempcwd/test_module.py module which was dynamically created by test_bdb.py itself. (cherry picked from commit 54fd45505b3a365e6d53441e6dd7e0d1ec13b46f) Co-authored-by: Alex H <1884912+lajarre@users.noreply.github.com> --- Lib/test/test_bdb.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_bdb.py b/Lib/test/test_bdb.py index d3ff8fc768..3ad70e21c8 100644 --- a/Lib/test/test_bdb.py +++ b/Lib/test/test_bdb.py @@ -569,11 +569,11 @@ def create_modules(modules): def break_in_func(funcname, fname=__file__, temporary=False, cond=None): return 'break', (fname, None, temporary, cond, funcname) -TEST_MODULE = 'test_module' +TEST_MODULE = 'test_module_for_bdb' TEST_MODULE_FNAME = TEST_MODULE + '.py' def tfunc_import(): - import test_module - test_module.main() + import test_module_for_bdb + test_module_for_bdb.main() def tfunc_main(): lno = 2 @@ -985,9 +985,9 @@ class RunTestCase(BaseTestCase): ('return', 3, 'main'), ('step', ), ('return', 1, ''), ('quit', ), ] - import test_module + import test_module_for_bdb with TracerRun(self) as tracer: - tracer.runeval('test_module.main()', globals(), locals()) + tracer.runeval('test_module_for_bdb.main()', globals(), locals()) class IssuesTestCase(BaseTestCase): """Test fixed bdb issues.""" @@ -997,7 +997,7 @@ class IssuesTestCase(BaseTestCase): # Check that the tracer does step into the caller frame when the # trace function is not set in that frame. code_1 = """ - from test_module_2 import func + from test_module_for_bdb_2 import func def main(): func() lno = 5 @@ -1008,12 +1008,12 @@ class IssuesTestCase(BaseTestCase): """ modules = { TEST_MODULE: code_1, - 'test_module_2': code_2, + 'test_module_for_bdb_2': code_2, } with create_modules(modules): self.expect_set = [ ('line', 2, 'tfunc_import'), - break_in_func('func', 'test_module_2.py'), + break_in_func('func', 'test_module_for_bdb_2.py'), ('None', 2, 'tfunc_import'), ('continue', ), ('line', 3, 'func', ({1:1}, [])), ('step', ), ('return', 3, 'func'), ('step', ), -- cgit v1.2.1