Skip to content

gh-154419: Find the fish shell in test_venv #154420

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
serhiy-storchaka merged 1 commit into from
Jul 22, 2026
+10 −2
Merged

gh-154419: Find the fish shell in test_venv #154420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions Lib/test/test_venv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,8 +783,16 @@ def test_fish_activate_shadowed_builtins(self):
shadows one of those builtins (a common pattern for `.`-style directory
navigators) must not hijack the prompt or break status restoration.
"""
fish = shutil.which('fish')
if fish is None:
# Some systems have an unrelated "fish" game (see fish(6)), which
# can precede the fish shell in PATH.
for dirname in None, *os.get_exec_path():
fish = shutil.which('fish', path=dirname)
if fish is not None and subprocess.run(
[fish, '-c', 'echo $FISH_VERSION'],
stdin=subprocess.DEVNULL,
capture_output=True).stdout.strip():
break
else:
self.skipTest('fish required for this test')
rmtree(self.env_dir)
builder = venv.EnvBuilder(clear=True)
Expand Down
Loading