mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 16:48:31 +02:00
Fix for hanging Windows tests on Travis (#969)
This commit is contained in:
parent
99711675d4
commit
7c7e2fae82
2 changed files with 13 additions and 8 deletions
|
@ -45,13 +45,11 @@ Feature: Basic reading and writing to a journal
|
|||
When we run "jrnl -n 1"
|
||||
Then the output should contain "2013-07-23 09:00 A cold and stormy day."
|
||||
|
||||
@skip_win
|
||||
Scenario: Writing an empty entry from the editor
|
||||
Given we use the config "editor.yaml"
|
||||
When we open the editor and enter nothing
|
||||
Then we should see the message "[Nothing saved to file]"
|
||||
|
||||
@skip_win
|
||||
Scenario: Sending an argument with spaces to the editor should work
|
||||
Given we use the config "editor-args.yaml"
|
||||
When we open the editor and enter "lorem ipsum"
|
||||
|
|
|
@ -93,8 +93,14 @@ def open_editor_and_enter(context, text=""):
|
|||
|
||||
return tmpfile
|
||||
|
||||
with patch("subprocess.call", side_effect=_mock_editor_function):
|
||||
# fmt: off
|
||||
# see: https://github.com/psf/black/issues/664
|
||||
with \
|
||||
patch("subprocess.call", side_effect=_mock_editor_function), \
|
||||
patch("sys.stdin.isatty", return_value=True) \
|
||||
:
|
||||
context.execute_steps('when we run "jrnl"')
|
||||
# fmt: on
|
||||
|
||||
|
||||
@then("the editor should have been called with {num} arguments")
|
||||
|
@ -150,11 +156,12 @@ def run_with_input(context, command, inputs=""):
|
|||
args = ushlex(command)[1:]
|
||||
|
||||
# fmt: off
|
||||
# see: https://github.com/psf/black/issues/557
|
||||
with patch("builtins.input", side_effect=_mock_input(text)) as mock_input, \
|
||||
# see: https://github.com/psf/black/issues/664
|
||||
with \
|
||||
patch("builtins.input", side_effect=_mock_input(text)) as mock_input, \
|
||||
patch("getpass.getpass", side_effect=_mock_getpass(text)) as mock_getpass, \
|
||||
patch("sys.stdin.read", side_effect=text) as mock_read:
|
||||
|
||||
patch("sys.stdin.read", side_effect=text) as mock_read \
|
||||
:
|
||||
try:
|
||||
cli.run(args or [])
|
||||
context.exit_status = 0
|
||||
|
|
Loading…
Add table
Reference in a new issue