Skip to content

gh-128438: Add EnvironmentVarGuard for test_pdb.py #128522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 11, 2025
Merged

gh-128438: Add EnvironmentVarGuard for test_pdb.py #128522

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9022ff
Add `EnvironmentVarGuard` for test_pdb.py
WolframAlph Jan 5, 2025
3e1f588
place return outside of ctx manager
WolframAlph Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions Lib/test/test_pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3152,17 +3152,13 @@ def run_pdb_script(self, script, commands,
self.addCleanup(os_helper.unlink, '.pdbrc')
self.addCleanup(os_helper.unlink, filename)

homesave = None
if remove_home:
homesave = os.environ.pop('HOME', None)
try:
with os_helper.EnvironmentVarGuard() as env:
if remove_home:
env.unset('HOME')
if script_args is None:
script_args = []
stdout, stderr = self._run_pdb([filename] + script_args, commands, expected_returncode, extra_env)
finally:
if homesave is not None:
os.environ['HOME'] = homesave
return stdout, stderr
return stdout, stderr
Copy link
Member

@gaogaotiantian gaogaotiantian Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leave this return statement out of with and it should be good to go.

Copy link
Contributor Author

@WolframAlph WolframAlph Jan 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 , addressed


def run_pdb_module(self, script, commands):
"""Runs the script code as part of a module"""
Expand Down Expand Up @@ -3585,17 +3581,14 @@ def test_readrc_kwarg(self):
self.assertIn("NameError: name 'invalid' is not defined", stdout)

def test_readrc_homedir(self):
save_home = os.environ.pop("HOME", None)
with os_helper.temp_dir() as temp_dir, patch("os.path.expanduser"):
rc_path = os.path.join(temp_dir, ".pdbrc")
os.path.expanduser.return_value = rc_path
try:
with os_helper.EnvironmentVarGuard() as env:
env.unset("HOME")
with os_helper.temp_dir() as temp_dir, patch("os.path.expanduser"):
rc_path = os.path.join(temp_dir, ".pdbrc")
os.path.expanduser.return_value = rc_path
with open(rc_path, "w") as f:
f.write("invalid")
self.assertEqual(pdb.Pdb().rcLines[0], "invalid")
finally:
if save_home is not None:
os.environ["HOME"] = save_home

def test_header(self):
stdout = StringIO()
Expand Down
Loading