fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-07-08 09:06:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix handling of user input (stdin, input, getpass)

Browse source
This commit is contained in:
Jonathan Wren 2021-11-27 14:21:23 -08:00
parent f7c12fbede
commit a6694f5273
3 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
tests/lib/fixtures.py
View file

@ -182,19 +182,22 @@ def toml_version(working_dir):
@fixture
def mock_password(request):
password = get_fixture(request, "password")
user_input = get_fixture(request, "user_input")
def _mock_password():
password = get_fixture(request, "password")
user_input = get_fixture(request, "user_input")
if password:
password = password.splitlines()
if password:
password = password.splitlines()
elif user_input:
password = user_input.splitlines()
elif user_input:
password = user_input.splitlines()
if not password:
return {}
if not password:
password = Exception("Unexpected call for password")
return {"getpass": lambda: patch("getpass.getpass", side_effect=password)}
return patch("getpass.getpass", side_effect=password)
return {"getpass": _mock_password}
@fixture
@ -219,14 +222,21 @@ def should_not():
@fixture
def mock_user_input(request, is_tty):
user_input = get_fixture(request, "user_input", "")
user_input = user_input.splitlines() if is_tty else [user_input]
if not user_input:
return {}
def _generator(target):
def _mock_user_input():
user_input = get_fixture(request, "user_input", "")
user_input = user_input.splitlines() if is_tty else [user_input]
if not user_input:
user_input = Exception("Unexpected call for user input")
return patch(target, side_effect=user_input)
return _mock_user_input
return {
"stdin": lambda: patch("sys.stdin.read", side_effect=user_input),
"input": lambda: patch("builtins.input", side_effect=user_input),
"stdin": _generator("sys.stdin.read"),
"input": _generator("builtins.input"),
}