Merge branch 'develop' into encryption-rework

Conflicts:
jrnl/output.py
This commit is contained in:
Jonathan Wren 2022-10-01 12:45:32 -07:00
commit 44cafe6c16
6 changed files with 64 additions and 9 deletions

View file

@ -23,6 +23,7 @@ def should_get_no_error(cli_run):
assert cli_run["status"] == 0, cli_run["status"]
@then(parse("the output should match\n{regex}"))
@then(parse('the output should match "{regex}"'))
def output_should_match(regex, cli_run):
out = cli_run["stdout"]